All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
	integration@gluster.org,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	qemu-block@nongnu.org, "Loïc Minier" <loic.minier@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Bharata B Rao" <bharata@linux.ibm.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Niels de Vos" <ndevos@redhat.com>
Subject: [Qemu-devel] [PATCH 5/6] configure: Link test before auto-enabling the pulseaudio library
Date: Fri, 14 Jun 2019 09:24:31 +0200	[thread overview]
Message-ID: <20190614072432.820-6-philmd@redhat.com> (raw)
In-Reply-To: <20190614072432.820-1-philmd@redhat.com>

Similarly to commit a73e82ef912, test the library links correctly
before considering it 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 -lpulse
  /usr/bin/ld: cannot find -lpulsecommon-11.1
  collect2: error: ld returned 1 exit status
  Makefile:204: recipe for target 'qemu-system-aarch64' failed
  make[1]: *** [qemu-system-aarch64] Error 1

  $ fgrep pulse config-host.mak
  PULSE_LIBS=-L/usr/lib/aarch64-linux-gnu/pulseaudio -lpulse -lpulsecommon-11.1

  $ lsb_release -cri
  Distributor ID: Ubuntu
  Release:        18.04
  Codename:       bionic

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 configure | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 4eed33e1b1..4d015496ae 100755
--- a/configure
+++ b/configure
@@ -3408,10 +3408,25 @@ for drv in $audio_drv_list; do
 
     pa | try-pa)
     if $pkg_config libpulse --exists; then
-        pulse_libs=$($pkg_config libpulse --libs)
-        audio_pt_int="yes"
-        if test "$drv" = "try-pa"; then
-            audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa/pa/')
+        pulse_cflags=$($pkg_config --cflags libpulse)
+        if test "$static" = "yes"; then
+            pulse_libs=$($pkg_config --libs --static libpulse)
+        else
+            pulse_libs=$($pkg_config --libs libpulse)
+        fi
+        # Packaging for the static libraries is not always correct.
+        # At least ubuntu 18.04 ships only shared libraries.
+        write_c_skeleton
+        if ! compile_prog "$pulse_cflags" "$pulse_libs" ; then
+            unset pulse_cflags pulse_libs
+            if test "$drv" = "try-pa"; then
+                audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa//')
+            fi
+        else
+            audio_pt_int="yes"
+            if test "$drv" = "try-pa"; then
+                audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa/pa/')
+            fi
         fi
     else
         if test "$drv" = "try-pa"; then
-- 
2.20.1



  parent reply	other threads:[~2019-06-14  7:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-14  7:24 [Qemu-devel] [PATCH 0/6] configure: Try to fix --static linking Philippe Mathieu-Daudé
2019-06-14  7:24 ` [Qemu-devel] [PATCH 1/6] configure: Only generate GLUSTERFS variables if glusterfs is usable Philippe Mathieu-Daudé
2019-06-14  7:43   ` Niels de Vos
2019-06-14  7:24 ` [Qemu-devel] [PATCH 2/6] configure: Link test before auto-enabling glusterfs libraries Philippe Mathieu-Daudé
2019-06-14  8:40   ` Philippe Mathieu-Daudé
2019-06-14  7:24 ` [Qemu-devel] [PATCH 3/6] configure: Link test before auto-enabling the libusb library Philippe Mathieu-Daudé
2019-06-14  7:24 ` [Qemu-devel] [PATCH 4/6] configure: Link test before auto-enabling the libusbredir library Philippe Mathieu-Daudé
2019-06-14  7:24 ` Philippe Mathieu-Daudé [this message]
2019-06-14  7:24 ` [Qemu-devel] [PATCH 6/6] .travis.yml: Test static linking Philippe Mathieu-Daudé
2019-06-14 14:03   ` Alex Bennée
2019-06-14  8:48 ` [Qemu-devel] [PATCH 0/6] configure: Try to fix --static linking Philippe Mathieu-Daudé
2019-06-14  8:53 ` Peter Maydell
2019-06-14 13:58   ` Alex Bennée
2019-06-14 14:30     ` Peter Maydell
2019-06-14 15:17       ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190614072432.820-6-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=bharata@linux.ibm.com \
    --cc=fam@euphon.net \
    --cc=integration@gluster.org \
    --cc=kraxel@redhat.com \
    --cc=loic.minier@linaro.org \
    --cc=mjt@tls.msk.ru \
    --cc=ndevos@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.