mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix linking of OCaml components when srcdir != builddir

Browse Source 
ocaml-link.sh is a generated file, so run it from the build directory.
Remove it from EXTRA_DIST and also adjust docs/guestfs-hacking.pod
accordingly.
This commit is contained in:
Geoff Toole
2020-04-19 13:42:30 +10:00
committed by Richard W.M. Jones
parent c2c11382bb
commit ef2761eaa0
10 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -237,7 +237,6 @@ EXTRA_DIST = \
logo/fish-10yrs.svg logo/fish-10yrs.png \ logo/fish-10yrs.svg logo/fish-10yrs.png \
logo/virt-builder.svg \ logo/virt-builder.svg \
m4/.gitignore \ m4/.gitignore \
ocaml-link.sh \
podcheck.pl \ podcheck.pl \
tests/automake2junit.ml \ tests/automake2junit.ml \
tests/test-functions.sh \ tests/test-functions.sh \

12
builder/Makefile.am
View File

@@ -240,9 +240,9 @@ virt_builder_DEPENDENCIES = \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
../common/mlcustomize/mlcustomize.$(MLARCHIVE) \ ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
../customize/customize.$(MLARCHIVE) \ ../customize/customize.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_builder_LINK = \ virt_builder_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(OBJECTS) -o $@ $(OBJECTS) -o $@
@@ -250,9 +250,9 @@ virt_builder_repository_DEPENDENCIES = \
$(REPOSITORY_OBJECTS) \ $(REPOSITORY_OBJECTS) \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
../common/mlxml/mlxml.$(MLARCHIVE) \ ../common/mlxml/mlxml.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_builder_repository_LINK = \ virt_builder_repository_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(REPOSITORY_OBJECTS) -o $@ $(REPOSITORY_OBJECTS) -o $@
@@ -348,9 +348,9 @@ endif
index_parser_tests_DEPENDENCIES = \ index_parser_tests_DEPENDENCIES = \
$(index_parser_tests_THEOBJECTS) \ $(index_parser_tests_THEOBJECTS) \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
index_parser_tests_LINK = \ index_parser_tests_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) $(OCAMLLINKFLAGS) \
$(index_parser_tests_THEOBJECTS) -o $@ $(index_parser_tests_THEOBJECTS) -o $@

4
customize/Makefile.am
View File

@@ -179,7 +179,7 @@ OCAMLCLIBS = \
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
virt_customize_DEPENDENCIES = \ virt_customize_DEPENDENCIES = \
$(top_srcdir)/ocaml-link.sh \ $(top_builddir)/ocaml-link.sh \
$(CUSTOMIZE_THEOBJECTS) \ $(CUSTOMIZE_THEOBJECTS) \
$(CUSTOMIZE_CMA) \ $(CUSTOMIZE_CMA) \
../common/mlcustomize/mlcustomize.$(MLARCHIVE) \ ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
@@ -189,7 +189,7 @@ virt_customize_DEPENDENCIES = \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
../common/mlcustomize/mlcustomize.$(MLARCHIVE) ../common/mlcustomize/mlcustomize.$(MLARCHIVE)
virt_customize_LINK = \ virt_customize_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(CUSTOMIZE_THEOBJECTS) -o $@ $(CUSTOMIZE_THEOBJECTS) -o $@

4
daemon/Makefile.am
View File

@@ -436,9 +436,9 @@ OCAMLLINKFLAGS = \
daemon_utils_tests_DEPENDENCIES = \ daemon_utils_tests_DEPENDENCIES = \
$(daemon_utils_tests_THEOBJECTS) \ $(daemon_utils_tests_THEOBJECTS) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
daemon_utils_tests_LINK = \ daemon_utils_tests_LINK = \
$(top_srcdir)/ocaml-link.sh \ $(top_builddir)/ocaml-link.sh \
-cclib '-lutils -lgnu' \ -cclib '-lutils -lgnu' \
-- \ -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \

4
dib/Makefile.am
View File

@@ -123,9 +123,9 @@ virt_dib_DEPENDENCIES = \
../common/mlgettext/mlgettext.$(MLARCHIVE) \ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \ ../common/mlpcre/mlpcre.$(MLARCHIVE) \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_dib_LINK = \ virt_dib_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(OBJECTS) -o $@ $(OBJECTS) -o $@

2
docs/guestfs-hacking.pod
View File

@@ -921,7 +921,7 @@ command, the list of objects and the C<-cclib> libraries in the
correct order otherwise. correct order otherwise.
virt_customize_LINK = \ virt_customize_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- ... $(top_builddir)/ocaml-link.sh -cclib '-lutils -lgnu' -- ...
The actual rules, which you can examine in F<customize/Makefile.am>, are a The actual rules, which you can examine in F<customize/Makefile.am>, are a
little bit more complicated than this because they have to handle: little bit more complicated than this because they have to handle:

4
get-kernel/Makefile.am
View File

@@ -105,9 +105,9 @@ virt_get_kernel_DEPENDENCIES = \
../common/mlgettext/mlgettext.$(MLARCHIVE) \ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \ ../common/mlpcre/mlpcre.$(MLARCHIVE) \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_get_kernel_LINK = \ virt_get_kernel_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(OBJECTS) -o $@ $(OBJECTS) -o $@

4
resize/Makefile.am
View File

@@ -104,9 +104,9 @@ virt_resize_DEPENDENCIES = \
../common/mlgettext/mlgettext.$(MLARCHIVE) \ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \ ../common/mlpcre/mlpcre.$(MLARCHIVE) \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_resize_LINK = \ virt_resize_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(OBJECTS) -o $@ $(OBJECTS) -o $@

4
sparsify/Makefile.am
View File

@@ -112,9 +112,9 @@ virt_sparsify_DEPENDENCIES = \
../common/mlgettext/mlgettext.$(MLARCHIVE) \ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \ ../common/mlpcre/mlpcre.$(MLARCHIVE) \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_sparsify_LINK = \ virt_sparsify_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(OBJECTS) -o $@ $(OBJECTS) -o $@

4
sysprep/Makefile.am
View File

@@ -165,9 +165,9 @@ virt_sysprep_DEPENDENCIES = \
../common/mltools/mltools.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \
../common/mlcustomize/mlcustomize.$(MLARCHIVE) \ ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
../customize/customize.$(MLARCHIVE) \ ../customize/customize.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh $(top_builddir)/ocaml-link.sh
virt_sysprep_LINK = \ virt_sysprep_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
$(OBJECTS) -o $@ $(OBJECTS) -o $@