[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] configure: Fix build with pkg-config and --sta
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 03/13] configure: Fix build with pkg-config and --static --enable-sdl |
Date: |
Wed, 12 Jul 2017 16:37:59 +0300 |
From: Thomas Huth <address@hidden>
The configure script prefers pkg-config over sdl-config, but
the "--static-libs" parameter only exists for the latter. With
pkg-config, "--static --libs" have to be used instead.
Buglink: https://bugs.launchpad.net/qemu/+bug/984516
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
configure | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 806658c98b..ce7e8aa842 100755
--- a/configure
+++ b/configure
@@ -2733,7 +2733,11 @@ int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
EOF
sdl_cflags=$($sdlconfig --cflags 2>/dev/null)
if test "$static" = "yes" ; then
- sdl_libs=$($sdlconfig --static-libs 2>/dev/null)
+ if $pkg_config $sdlname --exists; then
+ sdl_libs=$($pkg_config $sdlname --static --libs 2>/dev/null)
+ else
+ sdl_libs=$($sdlconfig --static-libs 2>/dev/null)
+ fi
else
sdl_libs=$($sdlconfig --libs 2>/dev/null)
fi
--
2.11.0
- [Qemu-devel] [PULL 00/13] Trivial patches for 2017-07-12, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 07/13] elf-loader: warn about invalid endianness, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 01/13] target/xtensa: gdbstub: drop dead return statement, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 06/13] configure: Handle having no c++ compiler in FORTIFY_SOURCE check, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 02/13] util/qemu-sockets: Drop unused helper socket_address_to_string(), Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 03/13] configure: Fix build with pkg-config and --static --enable-sdl,
Michael Tokarev <=
- [Qemu-devel] [PULL 11/13] include/hw/ptimer.h: Add documentation comments, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 12/13] qobject: Catch another straggler for use of qdict_put_str(), Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 05/13] hw/pci: define msi_nonbroken in pci-stub, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 13/13] qobject: Update coccinelle script to catch Q{INC, DEC}REF, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 10/13] hxtool: remove dead -q option, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 08/13] hw/core: fix missing return value in load_image_targphys_as(), Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 04/13] hw/misc: add missing includes, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 09/13] qga-win32: Fix memory leak of device information set, Michael Tokarev, 2017/07/12
- Re: [Qemu-devel] [PULL 00/13] Trivial patches for 2017-07-12, Eric Blake, 2017/07/12