[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 6/9] configure: Link test before auto-enabling Op
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-block] [PATCH v2 6/9] configure: Link test before auto-enabling OpenGL libraries |
Date: |
Fri, 14 Jun 2019 12:07:15 +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-lm32-softmmu
[...]
LINK lm32-softmmu/qemu-system-lm32
/usr/bin/ld: cannot find -lepoxy
/usr/bin/ld: cannot find -lgbm
collect2: error: ld returned 1 exit status
Makefile:204: recipe for target 'qemu-system-lm32' failed
make[1]: *** [qemu-system-lm32] Error 1
$ fgrep epoxy config-host.mak
OPENGL_LIBS=-lepoxy -ldl -lgbm -ldl
$ lsb_release -cri
Distributor ID: Ubuntu
Release: 18.04
Codename: bionic
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
configure | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 449dbd69ce..a3da5adf80 100755
--- a/configure
+++ b/configure
@@ -4133,11 +4133,21 @@ if test "$opengl" != "no" ; then
if $pkg_config $opengl_pkgs; then
opengl_cflags="$($pkg_config --cflags $opengl_pkgs)"
opengl_libs="$($pkg_config --libs $opengl_pkgs)"
- opengl=yes
- if test "$gtk" = "yes" && $pkg_config --exists "$gtkpackage >= 3.16"; then
- gtk_gl="yes"
+ # Packaging for the static libraries is not always correct.
+ # At least ubuntu 18.04 ships only shared libraries.
+ write_c_skeleton
+ if ! compile_prog "$opengl_cflags" "$opengl_libs" ; then
+ if test "$opengl" = "yes" ; then
+ error_exit "opengl check failed."
+ fi
+ opengl=no
+ else
+ opengl=yes
+ if test "$gtk" = "yes" && $pkg_config --exists "$gtkpackage >= 3.16";
then
+ gtk_gl="yes"
+ fi
+ QEMU_CFLAGS="$QEMU_CFLAGS $opengl_cflags"
fi
- QEMU_CFLAGS="$QEMU_CFLAGS $opengl_cflags"
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl" "Please install opengl (mesa) devel pkgs:
$opengl_pkgs"
--
2.20.1
- [Qemu-block] [PATCH v2 0/9] configure: Fix softmmu --static linking, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 1/9] configure: Only generate GLUSTERFS variables if glusterfs is usable, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 2/9] configure: Link test before auto-enabling GlusterFS libraries, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 3/9] configure: Link test before auto-enabling libusb library, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 4/9] configure: Link test before auto-enabling libusbredir library, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 5/9] configure: Link test before auto-enabling PulseAudio library, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 6/9] configure: Link test before auto-enabling OpenGL libraries,
Philippe Mathieu-Daudé <=
- [Qemu-block] [PATCH v2 7/9] configure: Link test before auto-enabling GTK libraries, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 8/9] tests/docker: Kludge for missing libunistring.so symlink on Ubuntu 18.04, Philippe Mathieu-Daudé, 2019/06/14
- [Qemu-block] [PATCH v2 9/9] .travis.yml: Test softmmu static linking, Philippe Mathieu-Daudé, 2019/06/14