search for: libxml2_lib

...nk.sh.in | 2 +- 26 files changed, 44 insertions(+), 8 deletions(-) diff --git a/align/Makefile.am b/align/Makefile.am index 4ecbf7e..92b86b7 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -68,6 +68,7 @@ virt_alignment_scan_LDADD = \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ + $(LTLIBINTL) \ ../gnulib/lib/libgnu.la \ -lm diff --git a/builder/Makefile.am b/builder/Makefile.am index 206abce..f747fc3 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -168,6 +168,7 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ $(LIBLZMA_LIBS)...

...anged, 44 insertions(+), 8 deletions(-) > > diff --git a/align/Makefile.am b/align/Makefile.am > index 4ecbf7e..92b86b7 100644 > --- a/align/Makefile.am > +++ b/align/Makefile.am > @@ -68,6 +68,7 @@ virt_alignment_scan_LDADD = \ > $(top_builddir)/src/libguestfs.la \ > $(LIBXML2_LIBS) \ > $(LIBVIRT_LIBS) \ > + $(LTLIBINTL) \ > ../gnulib/lib/libgnu.la \ > -lm > > diff --git a/builder/Makefile.am b/builder/Makefile.am > index 206abce..f747fc3 100644 > --- a/builder/Makefile.am > +++ b/builder/Makefile.am > @@ -168,6 +168,7 @@ OCAMLOPTFLAGS =...

Hi, continuing what started a couple of weeks ago [1], the attached patch series continues the work in making it easier to build and run libguestfs (in fixed appliance mode) on OSes different than Linux. The provided changes should cause no functional changes on Linux. [1] https://www.redhat.com/archives/libguestfs/2014-October/msg00176.html Thanks, -- Pino Pino Toscano (9): build: check

Mac OS X uses DYLD_LIBRARY_PATH rather than LD_LIBRARY_PATH. --- run.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/run.in b/run.in index a8c2904..bf7ea1b 100755 --- a/run.in +++ b/run.in @@ -77,13 +77,10 @@ fi

...uilder/link.sh.in +++ b/builder/link.sh.in @@ -19,4 +19,4 @@ # Hack automake to link binary properly. There is no other way to add # the -cclib parameter to the end of the command line. -exec "$@" -linkpkg -cclib '-pthread -lpthread -lutils @LIBTINFO_LIBS@ -lcrypt @LIBLZMA_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' +exec "$@" -linkpkg -cclib '-pthread -lpthread -lutils @LIBTINFO_LIBS@ @LIBCRYPT_LIBS@ @LIBLZMA_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' diff --git a/configure.ac b/configure.ac index d68190a..9d95c2c 100644 --- a/configure.ac +++ b/configure.ac @@ -590,6 +590,...

...t_scan_CPPFLAGS = \ virt_alignment_scan_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBCONFIG_CFLAGS) \ $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) virt_alignment_scan_LDADD = \ - $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libutils.la \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ diff --git a/df/Makefile.am b/df/Makefile.am index 6efc1dc..f4a8602 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST = \ bin_PROGRAMS = virt-df SHARED_SOURCE_FILES = \ - ../fish/config.c \ ../fish/decrypt.c \ ../fish/display-options.h \ ../fish/display-opt...

...\ - ../fish/uri.c + ../df/parallel.h virt_alignment_scan_SOURCES = \ $(SHARED_SOURCE_FILES) \ @@ -64,6 +54,7 @@ virt_alignment_scan_CFLAGS = \ virt_alignment_scan_LDADD = \ $(top_builddir)/src/libutils.la \ $(top_builddir)/src/libguestfs.la \ + $(top_builddir)/fish/libfishcommon.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ $(LTLIBINTL) \ diff --git a/cat/Makefile.am b/cat/Makefile.am index 5e55742..796e808 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -31,16 +31,6 @@ EXTRA_DIST = \ bin_PROGRAMS = virt-cat virt-filesystems virt-log virt-ls SHARED_SOURCE_FILES = \ - ../fish/decrypt...

...ettext],[no]) diff --git a/customize/Makefile.am b/customize/Makefile.am index f9dccd5..64509fd 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -124,7 +124,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ - $(LIBXML2_LIBS) $(LIBINTL) -ltinfo -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu diff --git a/mllib/Makefile.am b/mllib/Makefile.am index d248a72..112b610 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -99,7 +99,7 @@ OCAML...

..._LIBS" diff --git a/customize/Makefile.am b/customize/Makefile.am index c945685..f9dccd5 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -124,7 +124,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ - $(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) -ltinfo -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 567ff84..d248a72 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -99,7 +99,7 @@ OCAMLCFLAGS =...

...mon/options \ @@ -47,6 +48,7 @@ virt_alignment_scan_LDADD = \ $(top_builddir)/common/options/liboptions.la \ $(top_builddir)/common/parallel/libparallel.la \ $(top_builddir)/common/utils/libutils.la \ + $(top_builddir)/common/cleanups/libcleanups.la \ $(top_builddir)/lib/libguestfs.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ diff --git a/builder/Makefile.am b/builder/Makefile.am index 5f0606ca4..cfe302f9d 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -100,6 +100,7 @@ virt_builder_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(shell $(OCAMLC) -where...

...r)/df \ -I$(top_srcdir)/fish \ @@ -52,7 +53,7 @@ virt_alignment_scan_CFLAGS = \ $(LIBVIRT_CFLAGS) virt_alignment_scan_LDADD = \ - $(top_builddir)/src/libutils.la \ + $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/src/libguestfs.la \ $(top_builddir)/fish/libfishcommon.la \ $(LIBXML2_LIBS) \ diff --git a/builder/Makefile.am b/builder/Makefile.am index 2a9f89b..85c754f 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -100,6 +100,7 @@ virt_builder_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(shell $(OCAMLC) -where) \ -I$(top_srcdir)/gn...

...@ virt_alignment_scan_CFLAGS = \ virt_alignment_scan_LDADD = \ $(top_builddir)/common/options/liboptions.la \ $(top_builddir)/common/parallel/libparallel.la \ + $(top_builddir)/common/structs/libstructs.la \ $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/lib/libguestfs.la \ $(LIBXML2_LIBS) \ diff --git a/align/scan.c b/align/scan.c index 4fa95c0a3..b9f29868c 100644 --- a/align/scan.c +++ b/align/scan.c @@ -41,6 +41,7 @@ #include "getprogname.h" #include "guestfs.h" +#include "structs-cleanups.h" #include "options.h" #include "displ...

This patch series moves some files and directories around but is only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol

...e.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 OCAMLLINKFLAGS = mlguestfs.cmxa endif -virt_builder_DEPENDENCIES = $(OBJECTS) +virt_builder_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh virt_builder_LI...

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.

...m @@ -197,6 +197,7 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/lib virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBOSINFO_CFLAGS) @@ -230,6 +231,7 @@ endif OCAMLCLIBS = \ -lqemuopts \ + $(LIBGUESTFS_LIBS) \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ $(JANSSON_LIBS) \ -- 2.24.1

...dir)/locale"\" \ $(WARN_CFLAGS) $(WERROR_CFLAGS) diff --git a/xml/Makefile.am b/xml/Makefile.am index b2af45d..67ba248 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am @@ -23,10 +23,11 @@ bin_PROGRAMS = hivexml hivexml_SOURCES = \ hivexml.c -hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS) +hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS) hivexml_CFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/gnulib/lib \ + -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/lib \ $(LIBXML2_CFLAGS) \ $(WARN_CFLAGS) $(WE...

...847..3971d03 100644 --- a/v2v/link.sh.in +++ b/v2v/link.sh.in @@ -19,4 +19,4 @@ # Hack automake to link binary properly. There is no other way to add # the -cclib parameter to the end of the command line. -exec "$@" -linkpkg -cclib '-lutils @LIBTINFO_LIBS@ -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' +exec "$@" -linkpkg -cclib '-lutils @LIBTINFO_LIBS@ @LCRYPT_FLAG@ @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' -- 1.9.3

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

...-common_utils_tests_DEPENDENCIES = $(common_utils_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh +common_utils_tests_DEPENDENCIES = \ + $(common_utils_tests_THEOBJECTS) \ + $(MLLIB_CMA) \ + $(top_srcdir)/ocaml-link.sh common_utils_tests_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ $(common_utils_tests_THEOBJECTS) -o $@ -getopt_tests_DEPENDENCIES = $(getopt_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh +getopt_tests_DEPENDENCIES = \ + $(getopt_tests...