search for: libguestfsocaml_a_objects

...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/.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

...c21cf07c4ec2f094182ba9f32696f3de2751 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Mon, 23 Jan 2012 10:01:40 +0100 Subject: [PATCH libguestfs] build: don't use automake-internal variable * ocaml/Makefile.am (mlguestfs.cma): Use the documented variable form, $(libguestfsocaml_a_OBJECTS), not the $(am_libguestfsocaml_a_OBJECTS) that I suggested for commit 1.15.16-17-g8b9eaec. --- ocaml/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index fbeefc9..eac9b84 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makef...

...the OCaml subdirectory very slow (I normally > build with MAKEFLAGS=-j9). Was there a reason for adding this? I think I added this because both the mlguestfs.cma and mlguestfs.cmxa targets generate libmlguestfs.a: mlguestfs.cma: libguestfsocaml.a guestfs.cmo $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ -L$(top_builddir)/src/.libs -lguestfs mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ -L$(top_builddir)/src/.libs -lguestfs As far as I know, those are the only targets that shouldn't be run paralle...

...into a library, so that automake handles the C > # compilation step for us. Note that we don't directly use this > # library; we link with the object files that it generates. > noinst_LIBRARIES = libguestfsocaml.a > > You'll need 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) \ > -...

...file.am: # Build the C part into a library, so that automake handles the C # compilation step for us. Note that we don't directly use this # library; we link with the object files that it generates. noinst_LIBRARIES = libguestfsocaml.a You'll need 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...

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

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...

...n or # corrupt each others copy. Hence we have to serialize the calls. -CLEANFILES += stamp-mlguestfs - -mlguestfs.cma mlguestfs.cmxa: stamp-mlguestfs - -stamp-mlguestfs: libguestfsocaml.a guestfs.cmo guestfs.cmx +mlguestfs.cma: libguestfsocaml.a guestfs.cmo $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ -L$(top_builddir)/src/.libs -lguestfs + +mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ -L$(top_builddir)/src/.libs -lguestfs - touch $@ libguestfsocaml_a_CPPFLAGS = \ -DGUESTFS_PRIVATE=1 \ @@ -...

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

...-L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 41270a6..9723af9 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -66,10 +66,12 @@ endif stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ + $(LTLIBINTL) \ -L$(top_builddir)/src/.libs -lguestfs if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ + $(LTLIBINTL) \ -L$(top_builddir)/src/.libs -lguestfs endif touch $@ diff --git a/rescue/Makefile.am b/rescue/Makefil...

...ibs -lgnu > > diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am > index 41270a6..9723af9 100644 > --- a/ocaml/Makefile.am > +++ b/ocaml/Makefile.am > @@ -66,10 +66,12 @@ endif > stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) > $(OCAMLMKLIB) -o mlguestfs \ > $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ > + $(LTLIBINTL) \ > -L$(top_builddir)/src/.libs -lguestfs > if HAVE_OCAMLOPT > $(OCAMLMKLIB) -o mlguestfs \ > $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ > + $(LTLIBINTL) \ > -L$(top_builddir)/src/.libs -lguestfs > endif > touch $@ &gt...

...for us. Note that we don't directly use this @@ -55,13 +70,15 @@ CLEANFILES += stamp-mlguestfs mlguestfs.cma mlguestfs.cmxa: stamp-mlguestfs -stamp-mlguestfs: libguestfsocaml.a guestfs.cmo guestfs.cmx +stamp-mlguestfs: libguestfsocaml.a $(guestfs_deps) $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ -L$(top_builddir)/src/.libs -lguestfs +if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ -L$(top_builddir)/src/.libs -lguestfs +endif touch $@ libguestfsocaml_a_CPPFLAGS = \ @@ -121,11 +138,16 @@ test_progs_opt += \ t/guestf...

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

...top_builddir)/src/.libs \ -I $(top_builddir)/gnulib/lib/.libs \ -I $(top_builddir)/ocaml \ diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 100b046..8377a83 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -69,19 +69,20 @@ stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ $(LDFLAGS) \ $(LTLIBINTL) \ - -L$(top_builddir)/src/.libs -lguestfs + -L../src/.libs -lguestfs if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ $(LDFLAGS) \ $(LTLIBINTL) \ - -L$(top_builddir)/src/.libs -lguestfs +...

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.