search for: libxml2_cflag

...diff --git a/mltools/Makefile.am b/mltools/Makefile.am index ce4d1ac..3b4172d 100644 --- a/mltools/Makefile.am +++ b/mltools/Makefile.am @@ -103,7 +103,9 @@ libmltools_a_CPPFLAGS = \ -I$(top_srcdir)/common/mlutils libmltools_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ + $(LIBVIRT_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(JANSSON_CFLAGS) \ -fPIC diff --git a/mlutils/Makefile.am b/mlutils/Makefile.am index e86d7bb..38a683f 100644 --- a/mlutils/Makefile.am +++ b/mlutils/Makefile.am @@ -63,7 +63,8 @@ libmlcutils_a_CPPFLAGS = \ -I$(shell...

.../parallel.c \ ../df/parallel.h \ - ../fish/config.c \ ../fish/decrypt.c \ ../fish/display-options.h \ ../fish/display-options.c \ @@ -59,12 +58,10 @@ virt_alignment_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...

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

...index-parse.c \ + $(top_srcdir)/mllib/index-scan.c \ + $(top_srcdir)/mllib/index-struct.c \ + $(top_srcdir)/mllib/index-parser-c.c \ crypt-c.c \ perl_edit-c.c @@ -85,7 +89,8 @@ virt_customize_CPPFLAGS = \ virt_customize_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBVIRT_CFLAGS) \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + -Wno-unused-macros BOBJECTS = \ $(top_builddir)/mllib/config.cmo \ @@ -93,6 +98,7 @@ BOBJECTS = \ $(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/regedit.cmo \ $(top_builddir)/mllib/uRI.cmo \ + $(top_builddir)/mllib/ini_reader.cmo \ $(SOURCES_ML...

...DEPRECATED=1 \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -52,7 +53,7 @@ virt_cat_CFLAGS = \ $(LIBXML2_CFLAGS) virt_cat_LDADD = \ - $(top_builddir)/src/libutils.la \ + $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/src/libguestfs.la \ $(top_builddir)/fish/libfishcommon.la \ $(LIBXML2_LIBS) \ @@ -67,6 +68,7 @@ virt_filesystems_SOURCES = \ virt_filesystems_CPPFLAGS = \ -DGUESTFS_WARN...

...- a/common/mlaugeas/Makefile.am +++ b/common/mlaugeas/Makefile.am @@ -53,7 +53,7 @@ libmlaugeas_a_CPPFLAGS = \ -I$(top_builddir) \ -I$(shell $(OCAMLC) -where) libmlaugeas_a_CFLAGS = \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(WARN_CFLAGS) $(NO_SNV_CFLAGS) $(WERROR_CFLAGS) \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ -fPIC diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4 index 6621a2747..13310d5db 100644 --- a/m4/guestfs-c.m4 +++ b/m4/guestfs-c.m4 @@ -105,6 +105,12 @@ gl_WARN_ADD([-Wformat-truncation=1]) AC_SUBST([WARN_CFLAGS]) +NO_SNV_CFLAGS= +gl_COMPILER_OPTION_IF([-Wno-shift-negative-value],[ +...

...l \ uefi.ml \ utils.ml \ name_from_disk.ml \ @@ -103,8 +99,7 @@ SOURCES_ML = \ SOURCES_C = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c if HAVE_OCAML @@ -118,7 +113,6 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/src virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) BOBJECTS = \ @@ -166,8 +160,7 @@ virt_v2v_LINK = \ virt_v2v_copy_to_local_SOURCES = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c virt_v2v_copy_to_local_CPPFLAGS = \ -I. \ -I$(top_builddir) \ @@ -175,12 +168,9 @@ virt_v2v_copy_to_local_CPPFLAGS = \ -I$...

...ajl.mli + sources.mli REPOSITORY_SOURCES_C = \ index-scan.c \ index-struct.c \ index-parse.c \ - index-parser-c.c \ - yajl-c.c + index-parser-c.c man_MANS = noinst_DATA = @@ -156,8 +149,7 @@ virt_builder_CFLAGS = \ -Wno-unused-macros \ $(LIBLZMA_CFLAGS) \ $(LIBTINFO_CFLAGS) \ - $(LIBXML2_CFLAGS) \ - $(JANSSON_CFLAGS) + $(LIBXML2_CFLAGS) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) @@ -175,8 +167,7 @@ virt_builder_repository_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -Wno-unused-macros \ $(LIBTINFO_CFLAGS) \ - $(LIBXML2_CFLAGS) \ - $(YAJL_CFLAGS) + $(LIBX...

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

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.

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

...ze/perl_edit-c.c \ domainxml-c.c \ kvmuid-c.c \ utils-c.c \ @@ -117,8 +112,7 @@ virt_v2v_CPPFLAGS = \ -I. \ -I$(top_builddir) \ -I$(shell $(OCAMLC) -where) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/fish + -I$(top_srcdir)/src virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBXML2_CFLAGS) \ @@ -129,20 +123,10 @@ BOBJECTS = \ $(top_builddir)/mllib/common_gettext.cmo \ $(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/regedit.cmo \ - $(top_builddir)/mllib/progress.cmo \ $(top_builddir)/mllib/mkdtemp.cmo \ $(top_builddir)/mllib/JSON.cmo \ $(top_builddir)/cust...

...stomize/Makefile.am index b4ec9286a..a22e25c46 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -100,6 +100,7 @@ libcustomize_a_CPPFLAGS = \ -I$(top_srcdir)/common/edit libcustomize_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBCRYPT_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBXML2_CFLAGS) \ -fPIC diff --git a/customize/crypt-c.c b/customize/crypt-c.c index 70e6ea7f5..d5425cfaa 100644 --- a/customize/crypt-c.c +++ b/customize/crypt-c.c @@ -22,6 +22,10 @@ #include <stdlib.h> #include <unistd.h> +#if HAVE_CRYPT_H +#include <crypt.h> +#endif + #include <cam...

...AC_CHECK_HEADERS([byteswap.h endian.h libintl.h]) dnl Functions. AC_CHECK_FUNCS([bindtextdomain]) +AC_CHECK_FUNCS([open_memstream]) dnl Check for pod2man and pod2text. AC_CHECK_PROG([POD2MAN],[pod2man],[pod2man],[no]) @@ -173,6 +174,9 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) AC_SUBST([LIBXML2_CFLAGS]) AC_SUBST([LIBXML2_LIBS]) +dnl hivexsh depends on open_memstream, which is absent on OS X. +AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$HAVE_OPEN_MEMSTREAM" = "xyes"]) + dnl Check for OCaml (optional, for OCaml bindings). AC_PROG_OCAML AC_PROG_FINDLIB -- 1.7.4.4

...r)/gnulib/lib -I$(top_builddir)/gnulib/lib guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) .PHONY: force diff --git a/src/Makefile.am b/src/Makefile.am index 761fcb6..82a4004 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,7 +165,7 @@ libguestfs_la_CFLAGS = \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) -libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib +libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib if HAVE_RPCGEN guestfs_protocol.c: guestfs_protocol.x -- 1.7.7.3

...l \ uefi.ml \ utils.ml \ name_from_disk.ml \ @@ -103,8 +99,7 @@ SOURCES_ML = \ SOURCES_C = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c if HAVE_OCAML @@ -119,7 +114,6 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/lib virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) BOBJECTS = \ @@ -168,8 +162,7 @@ virt_v2v_LINK = \ virt_v2v_copy_to_local_SOURCES = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c virt_v2v_copy_to_local_CPPFLAGS = \ -I. \ -I$(top_builddir) \ @@ -178,12 +171,9 @@ virt_v2v_copy_to_local_CPPFLAGS = \ -I$...

...states.h \ unlocked.h \ - utils.c + utils.c \ + $(NULL) libnbd_la_CPPFLAGS = \ -I$(top_srcdir)/include \ - -Dsysconfdir=\"$(sysconfdir)\" + -Dsysconfdir=\"$(sysconfdir)\" \ + $(NULL) libnbd_la_CFLAGS = \ $(WARNINGS_CFLAGS) \ $(PTHREAD_CFLAGS) \ $(GNUTLS_CFLAGS) \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + $(NULL) libnbd_la_LIBADD = \ $(GNUTLS_LIBS) \ - $(LIBXML2_LIBS) + $(LIBXML2_LIBS) \ + $(NULL) libnbd_la_LDFLAGS = \ $(PTHREAD_LIBS) \ -Wl,--version-script=$(srcdir)/libnbd.syms \ - -version-info 0:0:0 + -version-info 0:0:0 \ + $(NULL) # pkg-config / pkgconf diff...

...m @@ -27,8 +27,6 @@ EXTRA_DIST = \ nbdinfo.pod \ $(NULL) -if HAVE_LIBXML2 - TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 LOG_COMPILER = $(top_builddir)/run TESTS = @@ -39,11 +37,9 @@ nbdinfo_SOURCES = nbdinfo.c nbdinfo_CPPFLAGS = -I$(top_srcdir)/include nbdinfo_CFLAGS = \ $(WARNINGS_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(NULL) nbdinfo_LDADD = \ $(top_builddir)/lib/libnbd.la \ - $(LIBXML2_LIBS) \ $(NULL) if HAVE_POD @@ -59,6 +55,8 @@ nbdinfo.1: nbdinfo.pod $(top_builddir)/podwrapper.pl endif HAVE_POD +if HAVE_LIBXML2 + TESTS += \ info-list.sh \ info-list-json.sh \ diff --git a/info/nbdinfo.c b...

...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) $(WERROR_CFLAGS) diff --git a/xml/hivexml.c b/xml/hivexml.c index 5030c24..d38e9d4 100644 --- a/xml/hivexml.c +++ b/xml/hivexml.c @@ -32,6 +32,8 @@ #include <libintl.h> #endif +#include <getopt.h> + #include <libxml/xmlwriter.h> #include "hivex.h...

I rethought this again, as I think that it's a dangerous assumption to bake qemu-img measure output into our API. This patch series runs qemu-img measure behind the scenes, but then parses the output and sums it to a single number which we print. Doing that required a bit of reworking, moving the Jansson [JSON parser] bindings from virt-builder into the common directory and a couple of other