[Qemu-devel] [PATCH 0/2] modules: two fixes

[Qemu-devel] [PATCH 0/2] modules: two fixes

[Gerd Hoffmann]

Gerd Hoffmann (2):
  modules: use gmodule-export
  modules: workaround buggy glib builds

 configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.9.3

[Qemu-devel] [PATCH 1/2] modules: use gmodule-export

[Gerd Hoffmann]

As we want qemu symbols be exported to modules we should use the
gmodule-export-2.0 pkg-config instead of gmodule-2.0.

Cc: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 6f3921c02a..eb612532aa 100755
--- a/configure
+++ b/configure
@@ -3352,7 +3352,7 @@ else
 fi
 glib_modules=gthread-2.0
 if test "$modules" = yes; then
-    glib_modules="$glib_modules gmodule-2.0"
+    glib_modules="$glib_modules gmodule-export-2.0"
 fi
 
 # This workaround is required due to a bug in pkg-config file for glib as it
-- 
2.9.3

[Qemu-devel] [PATCH 2/2] modules: workaround buggy glib builds

[Gerd Hoffmann]

https://bugzilla.gnome.org/show_bug.cgi?id=794123

Cc: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure b/configure
index eb612532aa..34e4bb419e 100755
--- a/configure
+++ b/configure
@@ -3366,6 +3366,10 @@ for i in $glib_modules; do
     if $pkg_config --atleast-version=$glib_req_ver $i; then
         glib_cflags=$($pkg_config --cflags $i)
         glib_libs=$($pkg_config --libs $i)
+        if test "$i" = "gmodule-export-2.0"; then
+            # make sure we link with --export-dynamic
+            glib_libs="-Wl,--export-dynamic ${glib_libs//-Wl,--export-dynamic/}"
+        fi
         QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
         LIBS="$glib_libs $LIBS"
         libs_qga="$glib_libs $libs_qga"
-- 
2.9.3