search for: ltlibintl

...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 = $(OCAMLCFLAGS) OCAMLCLIBS = \ $(LIBLZMA_LIBS) \ $(LIBXML2_LIBS) \ + $(LIBINTL) \...

...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 = \ > $(L...

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

...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.c \ - ../fish/display-options.h \ - ....

Some of the C tools were building also config.c as part of the shared sources from guestfish, and thus bringing a dependency on libconfig. Since none of them actually read the libguestfs configuration at all, then exclude fish/config.c from their build, and stop linking to libconfig. --- align/Makefile.am | 3 --- df/Makefile.am | 3 --- edit/Makefile.am | 3 ---

....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/.libs -lguestfs if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ + -ldopt '$(LDFLAGS)' \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ - $(LDFLAGS) \ $(LTLIBINTL) \ -L../lib/.libs -lguestfs endif -- 2.17.1

...libguestfsocaml_a_OBJECTS) is used instead, eg something like this > untested change: > > stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) > $(OCAMLMKLIB) -o mlguestfs \ > $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ > $(LDFLAGS) \ > $(LTLIBINTL) \ > - -L../lib/.libs -lguestfs > + -L../lib/.libs -lguestfs \ > + -L../gnulib/lib/.libs -lgnu > if HAVE_OCAMLOPT > $(OCAMLMKLIB) -o mlguestfs \ > $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ > $(LDFLAGS) \ > $...

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

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.

...d to change all the places where $(libguestfsocaml_a_OBJECTS) is used instead, eg something like this untested change: stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ $(LDFLAGS) \ $(LTLIBINTL) \ - -L../lib/.libs -lguestfs + -L../lib/.libs -lguestfs \ + -L../gnulib/lib/.libs -lgnu if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ $(LDFLAGS) \ $(LTLIBINTL) \ - -L../lib/.libs -...

On Fri, Sep 01, 2017 at 04:28:52AM -0400, Yongkui Guo wrote: > > stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) > > $(OCAMLMKLIB) -o mlguestfs \ > > $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ > > $(LDFLAGS) \ > > $(LTLIBINTL) \ > > - -L../lib/.libs -lguestfs > > + -L../lib/.libs -lguestfs \ > > + -L../gnulib/lib/.libs -lgnu [...] > ocamlmklib -o mlguestfs \ > libguestfsocaml_a-guestfs-c.o libguestfsocaml_a-guestfs-c-actions.o libguestfsocaml_a-guestfs-c-errnos.o ../comm...

...lib/lib -I../gnulib/lib @@ -104,8 +105,8 @@ libfishcommon_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBXML2_CFLAGS) libfishcommon_la_LIBADD = \ + $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/src/libguestfs.la \ - $(top_builddir)/src/libutils.la \ $(LIBXML2_LIBS) \ $(LTLIBINTL) @@ -162,6 +163,7 @@ guestfish_CPPFLAGS = \ -DCOMPILING_GUESTFISH=1 \ -DGUESTFS_WARN_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)/f...

Hi, I tried to do code coverage testing for libguestfs with gcov. The steps are shown as follows: 1. Download and install the source package(libguestfs-1.36.5-1.el7.src.rpm) 2. Modify libguestfs.spec file #diff -u libguestfs.spec libguestfs.spec.modify --------------------------------------------------------------------------------------- --- libguestfs.spec 2017-08-29 02:44:35.623751541 -0400

...reads if HAVE_LIBDL check_PROGRAMS += \ test-dlopen @@ -59,7 +60,8 @@ TESTS = \ test-user-cancel \ test-debug-to-file \ test-environment \ - test-event-string + test-event-string \ + test-threads if HAVE_LIBDL TESTS += \ test-dlopen @@ -265,6 +267,21 @@ test_event_string_LDADD = \ $(LTLIBINTL) \ $(top_builddir)/gnulib/lib/libgnu.la +test_threads_SOURCES = test-threads.c +test_threads_CPPFLAGS = \ + -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/gnulib/lib \ + -I$(top_builddir)/gnulib/lib +test_threads_CFL...

...-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib @@ -33,5 +34,6 @@ libwindows_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) libwindows_la_LIBADD = \ $(top_builddir)/common/utils/libutils.la \ + $(top_builddir)/common/cleanups/libcleanups.la \ $(top_builddir)/lib/libguestfs.la \ $(LTLIBINTL) diff --git a/configure.ac b/configure.ac index eba149241..33cdbd39e 100644 --- a/configure.ac +++ b/configure.ac @@ -182,6 +182,7 @@ AC_CONFIG_FILES([Makefile builder/test-simplestreams/virt-builder/repos.d/cirros.conf builder/test-website/virt-builder/repos.d/l...

...--- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -133,6 +133,7 @@ guestfish_CPPFLAGS = \ guestfish_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(RPC_CFLAGS) \ $(LIBCONFIG_CFLAGS) \ $(LIBXML2_CFLAGS) @@ -147,32 +148,23 @@ guestfish_LDADD = \ $(LIBREADLINE) \ $(LIBTINFO_LIBS) \ $(LTLIBINTL) \ + $(RPC_LIBS) \ -lm # Make guestfish use the convenience libraries. noinst_LTLIBRARIES = libcmds.la librc_protocol.la guestfish_LDADD += libcmds.la librc_protocol.la ../gnulib/lib/libgnu.la -if HAVE_RPCGEN -RPCGEN_DEFS = -if HAVE_XDR_U_INT64_T -RPCGEN_DEFS += -DHAVE_XDR_U_INT64_T=1 -els...

v1 -> v2: - No functional changes to the patch, just fixes a few bugs. Rich.

...x d54aaee..7e5b92b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -33,11 +33,11 @@ libhivex_la_SOURCES = \ libhivex_la_LIBADD = ../gnulib/lib/libgnu.la libhivex_la_LDFLAGS = \ -version-info 0:0:0 \ - $(VERSION_SCRIPT_FLAGS)hivex.syms \ + $(VERSION_SCRIPT_FLAGS)$(srcdir)/hivex.syms \ $(LTLIBINTL) \ $(LTLIBTHREAD) libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) -libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib +libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir) include_HEADERS = hivex.h @@ -56,10 +56,10 @@ noinst_DATA = \ $(top_builddir)/html/hivex.3.html: hivex....

...onfused by this patch, and also worried that it may be > reverting commit 75514ab57a. It is basically looking for whatever provides the *gettext and bindtextdomain functions, not caring about embedded libintl copies. If they are in libc (like implemented in GNU libc), then the LIBINTL & LTLIBINTL variables are empty, otherwise they will contain the library (usually an external libintl.so). > Does this require gettextize? Definitely not; this commit does not change the way messages are extracted. -- Pino Toscano

...Makefile.am b/lib/Makefile.am index a339a00..8d7ff69 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -36,6 +36,7 @@ libhivex_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) libhivex_la_LDFLAGS = \ -version-info 0:0:0 \ $(VERSION_SCRIPT_FLAGS)$(srcdir)/hivex.syms \ + $(LTLIBICONV) \ $(LTLIBINTL) \ $(LTLIBTHREAD) libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) -- 1.8.2 -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libguestfs/attachments/20130405/c294c15c/attachment.htm>