Displaying 20 results from an estimated 186 matches for "ocamlpackag".
Did you mean:
ocamlpackages
2014 Oct 23
2
[PATCH 1/2] ocaml: Factor out flags into configure script.
...+-
sysprep/Makefile.am | 2 +-
v2v/Makefile.am | 2 +-
10 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/builder/Makefile.am b/builder/Makefile.am
index dd96533..fd5c8e2 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -158,7 +158,7 @@ if HAVE_OCAML_PKG_GETTEXT
OCAMLPACKAGES += -package gettext-stub
endif
-OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX-3 $(OCAMLPACKAGES)
+OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
OCAMLCLIBS = \
diff --git a/configure.ac b/configure.ac
index d464615..20f87ca 100644
--- a/confi...
2015 May 13
0
[PATCH 2/2] mllib: link tests with automake
...sts_BOBJECTS = \
+ JSON.cmo \
+ JSON_tests.cmo
+JSON_tests_XOBJECTS = $(JSON_tests_BOBJECTS:.cmo=.cmx)
+
+# Can't call the following as <test>_OBJECTS because automake gets confused.
if HAVE_OCAMLOPT
+common_utils_tests_THEOBJECTS = $(common_utils_tests_XOBJECTS)
common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
-common_utils_tests: config.cmx common_gettext.cmx common_utils.cmx common_utils_tests.cmx
- $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
- mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -o $@
+JSON_tests_THEOBJECTS = $(...
2016 Jul 18
2
[PATCH 1/2] build: Fix dependencies on mllib and customize.
...srcdir)/ocaml-link.sh
+virt_builder_DEPENDENCIES = \
+ $(OBJECTS) \
+ ../mllib/mllib.$(MLARCHIVE) \
+ ../customize/customize.$(MLARCHIVE) \
+ $(top_srcdir)/ocaml-link.sh
virt_builder_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
@@ -236,7 +240,11 @@ yajl_tests_THEOBJECTS = $(yajl_tests_BOBJECTS)
yajl_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
endif
-yajl_tests_DEPENDENCIES = $(yajl_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh
+yajl_tests_DEPENDENCIES = \
+ $(yajl_tests_THEOBJECTS) \
+ .....
2011 Aug 25
1
[PATCH] Correctly build febootstrap on systems without native OCaml compiler
...file.am b/Makefile.am
index 109d2c8..4dc6f12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,18 +56,18 @@ SOURCES_ML = $(filter %.ml,$(SOURCES))
BOBJECTS = $(SOURCES_ML:.ml=.cmo)
XOBJECTS = $(SOURCES_ML:.ml=.cmx)
-if !HAVE_OCAMLOPT
-OBJECTS = $(BOBJECTS)
-else
-OBJECTS = $(XOBJECTS)
-endif
-
OCAMLPACKAGES = -package unix,str
OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
-febootstrap: $(OBJECTS)
- $(OCAMLFIND) $(OCAMLBEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg \
+if !HAVE_OCAMLOPT
+febootstrap: $(BOBJECTS)
+ $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg \
+ $^ -o $@
+else
+febootstrap...
2015 May 13
3
[PATCH 1/2] build: factor out the OCaml link.sh scripts
...-6.img
/v2v/centos-7.0.img
/v2v/fedora-20.img
-/v2v/link.sh
/v2v/oUnit-*
/v2v/rhel-5.10.img
/v2v/rhel-6.5.img
diff --git a/builder/Makefile.am b/builder/Makefile.am
index bfe2f79..182f5a4 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -150,6 +150,16 @@ if HAVE_OCAML_PKG_GETTEXT
OCAMLPACKAGES += -package gettext-stub
endif
+OCAMLCLIBS = \
+ -pthread -lpthread \
+ -lutils \
+ $(LIBTINFO_LIBS) \
+ $(LIBCRYPT_LIBS) \
+ $(LIBLZMA_LIBS) \
+ $(LIBXML2_LIBS) \
+ $(LIBINTL) \
+ -lgnu
+
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
if !HAVE_OCAMLOPT
@@ -162,9 +172,9 @@ BEST = opt...
2015 Jan 22
3
[PATCH 1/2] configure: look for the oUnit OCaml module
It will be used for the OCaml unit tests.
---
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index e0fb481..e360bbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,6 +1120,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[
])
OCAML_PKG_gettext=no
+OCAML_PKG_oUnit=no
AS_IF([test "x$OCAMLC" != "xno"],[
#
2016 Aug 04
1
[PATCH] build: add simple custom silent rules for automake
...s_am_v_javac_@AM_DEFAULT_V@)
+guestfs_am_v_javac_0 = @echo " JAVAC " $@;
+guestfs_am_v_erlc = $(guestfs_am_v_erlc_@AM_V@)
+guestfs_am_v_erlc_ = $(guestfs_am_v_erlc_@AM_DEFAULT_V@)
+guestfs_am_v_erlc_0 = @echo " ERLC " $@;
+
.mli.cmi:
- $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+ $(guestfs_am_v_ocamlc)$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
.ml.cmo:
- $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+ $(guestfs_am_v_ocamlc)$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
if HAVE_OCAMLOPT
.ml....
2015 Jan 22
0
[PATCH 2/2] mllib: convert common_utils_tests to oUnit
...| 17 ++++-
mllib/common_utils_tests.ml | 155 +++++++++++++++++++++++++++-----------------
2 files changed, 108 insertions(+), 64 deletions(-)
diff --git a/mllib/Makefile.am b/mllib/Makefile.am
index f8671a9..7b4da0f 100644
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -86,9 +86,13 @@ OCAMLPACKAGES = \
-I $(top_builddir)/src/.libs \
-I $(top_builddir)/gnulib/lib/.libs \
-I $(top_builddir)/ocaml
+OCAMLPACKAGES_TESTS =
if HAVE_OCAML_PKG_GETTEXT
OCAMLPACKAGES += -package gettext-stub
endif
+if HAVE_OCAML_PKG_OUNIT
+OCAMLPACKAGES_TESTS += -package oUnit
+endif
OCAMLFLAGS = $(OCAML_F...
2016 Jul 14
2
[PATCH 0/2] Build mllib and customize into libraries.
Simplifies the build a bit.
This is on top of the previous SELinux relabelling patch set, although
not related to it.
Rich.
2019 Jun 15
2
[libnbd PATCH] build: Fix OCaml build on Fedora 29
...caml/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 0d876bb..557151c 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -32,6 +32,11 @@ if HAVE_OCAML
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
OCAMLPACKAGES = -package unix
+NBD.cmi: NBD.mli
+ $(OCAMLC) -c $< -o $@
+
+NBD.cmo: NBD.cmi
+
noinst_DATA = mlnbd.cma META
if HAVE_OCAMLOPT
noinst_DATA += mlnbd.cmxa
--
2.20.1
2015 Jan 23
0
[PATCH 2/2] mllib: add simple tests for the JSON module
...efile.am
@@ -21,7 +21,8 @@ EXTRA_DIST = \
$(SOURCES_MLI) \
$(filter-out config.ml libdir.ml,$(SOURCES_ML)) \
$(SOURCES_C) \
- common_utils_tests.ml
+ common_utils_tests.ml \
+ JSON_tests.ml
CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o
@@ -139,11 +140,21 @@ common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
common_utils_tests: common_gettext.cmx common_utils.cmx common_utils_tests.cmx
$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -o $@
+
+JSON_tests.cmx: OCAMLPACKAGES += $(OC...
2014 Feb 26
2
Re: enable build for ocaml bytecode
...x \
builder.cmx
+if HAVE_OCAMLOPT
+FINAL_BINARY = virt-builder.opt
+else
+FINAL_BINARY = virt-builder.bc
+endif
+
bin_SCRIPTS = virt-builder
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
@@ -73,7 +102,6 @@ bin_SCRIPTS = virt-builder
# installed copy of libguestfs.
OCAMLPACKAGES = \
-package str,unix \
- -I $(top_builddir)/src/.libs \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/mllib
if HAVE_OCAML_PKG_GETTEXT
@@ -81,15 +109,29 @@ OCAMLPACKAGES += -package gettext-stub
endif
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
-OCAMLOPTFLAGS = $(OCAMLC...
2017 Jul 24
0
[PATCH v3] common/mlstdutils: Build a bytecode version of this library.
...because the generator always requires the bytecode version.
+noinst_DATA = mlstdutils.cma mlstdutils.cmxa
libmlstdutils_a_SOURCES = dummy.c
libmlstdutils_a_CPPFLAGS = \
@@ -79,8 +81,13 @@ endif
libmlstdutils_a_DEPENDENCIES = $(OBJECTS)
-$(MLSTDUTILS_CMA): $(OBJECTS)
- $(OCAMLFIND) mklib $(OCAMLPACKAGES) $(OBJECTS) -o mlstdutils
+mlstdutils.cma: $(BOBJECTS)
+ $(OCAMLFIND) ocamlc $(OCAMLPACKAGES) -a $^ -o $@
+
+if HAVE_OCAMLOPT
+mlstdutils.cmxa: $(XOBJECTS)
+ $(OCAMLFIND) ocamlopt $(OCAMLPACKAGES) -a $^ -o $@
+endif
# This OCaml module has to be generated by make (configure will put
# unexpan...
2018 Sep 20
2
[PATCH 1/2] tools: Link OCaml programs with -runtime-variant _pic if available.
OCaml has a small runtime which is statically linked into the virt
tools (providing things like GC and primitives). Since OCaml 4.03 it
has been possible to select variants of this runtime, one of which is
compiled with -fPIC, using ‘ocamlopt -runtime-variant _pic’.
This has performance implications on i686, but is relatively free on
other architectures. Since it (in theory) adds to the
2017 Jul 24
0
[PATCH v4] common/mlstdutils: Build a bytecode version of this library.
...e bytecode version.
+noinst_DATA = mlstdutils.cma
+if HAVE_OCAMLOPT
+noinst_DATA += mlstdutils.cmxa
+endif
libmlstdutils_a_SOURCES = dummy.c
libmlstdutils_a_CPPFLAGS = \
@@ -79,8 +84,13 @@ endif
libmlstdutils_a_DEPENDENCIES = $(OBJECTS)
-$(MLSTDUTILS_CMA): $(OBJECTS)
- $(OCAMLFIND) mklib $(OCAMLPACKAGES) $(OBJECTS) -o mlstdutils
+mlstdutils.cma: $(BOBJECTS)
+ $(OCAMLFIND) ocamlc $(OCAMLPACKAGES) -a $^ -o $@
+
+if HAVE_OCAMLOPT
+mlstdutils.cmxa: $(XOBJECTS)
+ $(OCAMLFIND) ocamlopt $(OCAMLPACKAGES) -a $^ -o $@
+endif
# This OCaml module has to be generated by make (configure will put
# unexpan...
2014 Sep 14
2
Re: ocamldep -all seems to break builds on platforms without a native compiler
* Richard W.M. Jones:
> Yes, also this commit doesn't actually fix the problem. I still see
> occasional problems building StringMap. I have reverted this commit.
Here's another patch that should enable the native-code targets only if
they can be built.
Cheers,
-Hilko
2017 Jun 15
0
[PATCH v6 10/41] mllib, v2v: Split out OCaml utils bindings ‘common/mlutils’.
...+SUBDIRS += resize
+SUBDIRS += sparsify
+SUBDIRS += sysprep
+SUBDIRS += v2v
if HAVE_OCAML_PKG_LIBVIRT
SUBDIRS += v2v/test-harness
endif
diff --git a/builder/Makefile.am b/builder/Makefile.am
index cfe302f9d..355cfd0d1 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -127,6 +127,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/gnulib/lib/.libs \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \
+ -I $(top_builddir)/common/mlutils \
-I $(top_builddir)/mllib \
-I $(top_builddir)/customize
OCAMLPACKAGES_TESTS =
@@ -160,6 +161,7 @@ endif
OCAMLLINKFLAGS = \
mlstdutils.$(M...
2017 Jul 24
0
Re: [PATCH v2] common/mlstdutils: Build a bytecode version of this library.
...e version.
> +noinst_DATA = mlstdutils.cma mlstdutils.cmxa
>
> libmlstdutils_a_SOURCES = dummy.c
> libmlstdutils_a_CPPFLAGS = \
> @@ -79,8 +81,11 @@ endif
>
> libmlstdutils_a_DEPENDENCIES = $(OBJECTS)
>
> -$(MLSTDUTILS_CMA): $(OBJECTS)
> - $(OCAMLFIND) mklib $(OCAMLPACKAGES) $(OBJECTS) -o mlstdutils
> +mlstdutils.cma: $(BOBJECTS)
> + $(OCAMLFIND) ocamlc $(OCAMLPACKAGES) -a $^ -o $@
> +
> +mlstdutils.cmxa: $(XOBJECTS)
> + $(OCAMLFIND) ocamlopt $(OCAMLPACKAGES) -a $^ -o $@
>
> # This OCaml module has to be generated by make (configure will put...
2015 Jan 23
2
[PATCH 1/2] mllib: tests: add tests for string_lines_split
---
mllib/common_utils_tests.ml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/mllib/common_utils_tests.ml b/mllib/common_utils_tests.ml
index 09d5c51..283e9a1 100644
--- a/mllib/common_utils_tests.ml
+++ b/mllib/common_utils_tests.ml
@@ -27,6 +27,7 @@ let prog = "common_utils_tests"
let assert_equal_string = assert_equal ~printer:(fun x -> x)
let
2016 Jul 15
0
[PATCH 3/3] mllib: tests: Add tests of the new Getopt module.
...OBJECTS = $(getopt_tests_BOBJECTS:.cmo=.cmx)
+
JSON_tests_SOURCES = dummy.c
JSON_tests_BOBJECTS = JSON_tests.cmo
JSON_tests_XOBJECTS = $(JSON_tests_BOBJECTS:.cmo=.cmx)
@@ -171,16 +180,24 @@ if !HAVE_OCAMLOPT
common_utils_tests_THEOBJECTS = $(common_utils_tests_BOBJECTS)
common_utils_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
+getopt_tests_THEOBJECTS = $(getopt_tests_BOBJECTS)
+getopt_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
+
JSON_tests_THEOBJECTS = $(JSON_tests_BOBJECTS)
JSON_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
+
BEST = c
OCAMLLINKFLAGS = mlguestfs.cma -cus...