[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/9] configure: Link test before auto-enabling Gl
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 2/9] configure: Link test before auto-enabling GlusterFS libraries |
Date: |
Fri, 14 Jun 2019 12:07:11 +0200 |
Similarly to commit a73e82ef912, test the libraries link correctly
before considering them as usable.
This fixes using ./configure --static on Ubuntu 18.04:
$ make subdir-aarch64-softmmu
[...]
LINK aarch64-softmmu/qemu-system-aarch64
/usr/bin/ld: cannot find -lgfapi
/usr/bin/ld: cannot find -lglusterfs
/usr/bin/ld: cannot find -lgfrpc
/usr/bin/ld: cannot find -lgfxdr
collect2: error: ld returned 1 exit status
Makefile:204: recipe for target 'qemu-system-aarch64' failed
make[1]: *** [qemu-system-aarch64] Error 1
$ fgrep gf config-host.mak
GLUSTERFS_LIBS=-lacl -lgfapi -lglusterfs -lgfrpc -lgfxdr -luuid
$ lsb_release -cri
Distributor ID: Ubuntu
Release: 18.04
Codename: bionic
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
configure | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 13fd4a1166..fe0e2e1b75 100755
--- a/configure
+++ b/configure
@@ -4179,9 +4179,19 @@ fi
# glusterfs probe
if test "$glusterfs" != "no" ; then
if $pkg_config --atleast-version=3 glusterfs-api; then
- glusterfs="yes"
glusterfs_cflags=$($pkg_config --cflags glusterfs-api)
glusterfs_libs=$($pkg_config --libs glusterfs-api)
+ # Packaging for the static libraries is not always correct.
+ # At least ubuntu 18.04 ships only shared libraries.
+ write_c_skeleton
+ if ! compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then
+ if test "$glusterfs" = "yes" ; then
+ error_exit "glusterfs check failed."
+ fi
+ glusterfs="no"
+ else
+ glusterfs="yes"
+ fi
if $pkg_config --atleast-version=4 glusterfs-api; then
glusterfs_xlator_opt="yes"
fi
--
2.20.1
- [Qemu-devel] [PATCH v2 0/9] configure: Fix softmmu --static linking, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 1/9] configure: Only generate GLUSTERFS variables if glusterfs is usable, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 2/9] configure: Link test before auto-enabling GlusterFS libraries,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 3/9] configure: Link test before auto-enabling libusb library, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 4/9] configure: Link test before auto-enabling libusbredir library, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 5/9] configure: Link test before auto-enabling PulseAudio library, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 6/9] configure: Link test before auto-enabling OpenGL libraries, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 7/9] configure: Link test before auto-enabling GTK libraries, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 8/9] tests/docker: Kludge for missing libunistring.so symlink on Ubuntu 18.04, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-devel] [PATCH v2 9/9] .travis.yml: Test softmmu static linking, Philippe Mathieu-Daudé, 2019/06/14