[PATCH] remove ulockmgr from fuse LDFLAGS
libguestfs fails to build with --enable-fuse on openSuSE 11.4 and earlier because the included fuse version does not include libulockmgr.so. configure already used pkgconfig to retrieve the correct CFLAGS, so there is no need to hardcode -lulockmgr. With this change the build succeeds again. Signed-off-by: Olaf Hering <olaf@aepfle.de> diff --git a/examples/Makefile.am b/examples/Makefile.am index 35bf765..4bfa85d 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -86,7 +86,7 @@ mount_local_CFLAGS = \ $(FUSE_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) mount_local_LDADD = \ - $(FUSE_LIBS) -lulockmgr \ + $(FUSE_LIBS) \ $(top_builddir)/src/libguestfs.la endif diff --git a/fuse/Makefile.am b/fuse/Makefile.am index 079755b..1295298 100644 --- a/fuse/Makefile.am +++ b/fuse/Makefile.am @@ -51,7 +51,7 @@ guestmount_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) guestmount_LDADD = \ - $(FUSE_LIBS) -lulockmgr \ + $(FUSE_LIBS) \ $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libguestfs.la \ ../gnulib/lib/libgnu.la diff --git a/src/Makefile.am b/src/Makefile.am index 4d85747..97905bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,7 +177,7 @@ libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib if HAVE_FUSE # XXX Unfortunately FUSE_CFLAGS defines _FILE_OFFSET_BITS=64. libguestfs_la_CFLAGS += $(FUSE_CFLAGS) -libguestfs_la_LIBADD += $(FUSE_LIBS) -lulockmgr +libguestfs_la_LIBADD += $(FUSE_LIBS) endif if HAVE_RPCGEN diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am index 384eb2d..d0c1cf8 100644 --- a/tests/mount-local/Makefile.am +++ b/tests/mount-local/Makefile.am @@ -34,7 +34,7 @@ test_parallel_mount_local_CFLAGS = \ $(FUSE_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_parallel_mount_local_LDADD = \ - $(FUSE_LIBS) -lulockmgr \ + $(FUSE_LIBS) \ $(top_builddir)/src/libguestfs.la endif -- 1.7.11.5
On Wed, Aug 29, 2012 at 03:15:12PM +0200, Olaf Hering wrote:
libguestfs fails to build with --enable-fuse on openSuSE 11.4 and earlier because the included fuse version does not include libulockmgr.so. configure already used pkgconfig to retrieve the correct CFLAGS, so there is no need to hardcode -lulockmgr. With this change the build succeeds again.
Thanks for the patch. What is the output of these commands on SuSE? (Fedora output shown). $ pkg-config --cflags fuse -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse $ pkg-config --libs fuse -pthread -lfuse -lrt -ldl I suspect there is a packaging bug in Fedora ... 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#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
On Wed, Aug 29, Richard W.M. Jones wrote:
On Wed, Aug 29, 2012 at 03:15:12PM +0200, Olaf Hering wrote:
libguestfs fails to build with --enable-fuse on openSuSE 11.4 and earlier because the included fuse version does not include libulockmgr.so. configure already used pkgconfig to retrieve the correct CFLAGS, so there is no need to hardcode -lulockmgr. With this change the build succeeds again.
Thanks for the patch. What is the output of these commands on SuSE? (Fedora output shown).
In openSuSE 12.2 its like this: bax:~> pkg-config --cflags fuse -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse bax:~> pkg-config --libs fuse -pthread -lfuse Olaf
On Wed, Aug 29, 2012 at 05:30:49PM +0200, Olaf Hering wrote:
On Wed, Aug 29, Richard W.M. Jones wrote:
On Wed, Aug 29, 2012 at 03:15:12PM +0200, Olaf Hering wrote:
libguestfs fails to build with --enable-fuse on openSuSE 11.4 and earlier because the included fuse version does not include libulockmgr.so. configure already used pkgconfig to retrieve the correct CFLAGS, so there is no need to hardcode -lulockmgr. With this change the build succeeds again.
Thanks for the patch. What is the output of these commands on SuSE? (Fedora output shown).
In openSuSE 12.2 its like this:
bax:~> pkg-config --cflags fuse -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse bax:~> pkg-config --libs fuse -pthread -lfuse
I guess I should have checked if Fedora needed -lulockmgr any longer. It appears that it does not, so I have applied your patch and will push it shortly. Thanks for your contribution! 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#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
participants (2)
-
Olaf Hering -
Richard W.M. Jones