Displaying 2 results from an estimated 2 matches for "4d13eed97".
2018 Sep 27
1
[PATCH] ocaml: make sure to pass LDFLAGS to ocamlmklibs linker (RHBZ#1624130)
...GS properly as arguments for the C linker when using
ocamlmklibs via the -ldopt option.
Followup of commit 34c23403c51a4d59d826c8045e06f9aabc2ceb16.
---
ocaml/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 752fc109c..4d13eed97 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -64,14 +64,14 @@ endif
stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm)
$(OCAMLMKLIB) -o mlguestfs \
+ -ldopt '$(LDFLAGS)' \
$(libguestfsocaml_a_OBJECTS) guestfs.cmo \
- $(LDFLAGS) \
$(LTLIBINTL) \
-L../lib/.lib...
2019 May 28
1
[PATCH] build: build C sources using OCaml API with CAML_NAME_SPACE
...LC) -where)/hivex \
-I$(top_srcdir)/gnulib/lib \
@@ -398,6 +399,7 @@ daemon_utils_tests_SOURCES = \
utils.c \
utils-c.c
daemon_utils_tests_CPPFLAGS = \
+ -DCAML_NAME_SPACE \
-I. \
-I$(top_builddir) \
-I$(shell $(OCAMLC) -where) \
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 4d13eed97..b31e8fc65 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -78,6 +78,7 @@ endif
touch $@
libguestfsocaml_a_CPPFLAGS = \
+ -DCAML_NAME_SPACE \
-DGUESTFS_PRIVATE=1 \
-I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/util...