diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-25 17:36:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-25 18:34:28 +0000 |
| commit | aa0d1f448871314bfc535da97eb003fe7766d4c2 (patch) | |
| tree | 9e93f3a4342c000a0c07238f1d7d794c8ccb4346 | |
| parent | a89d97df1f6d9f5bd6403a9d91d9d7cd86bdd394 (diff) | |
modules: do not include gmodule-2.0 in static builds
gmodule-2.0's pkg-config files include -Wl,--export-dynamic, which breaks
static builds. It is a glib bug, but we need to support --static builds for
the linux-user targets, and in the end all that is needed to fix this is:
* outlaw --enable-modules --static, which makes little sense anyway
* only include gmodule-2.0's cflags and ldflags if --enable-modules is
specified on the command line.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1393346215-5636-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | util/module.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1424,6 +1424,9 @@ if compile_prog "-Werror -fno-gcse" "" ; then fi if test "$static" = "yes" ; then + if test "$modules" = "yes" ; then + error_exit "static and modules are mutually incompatible" + fi if test "$pie" = "yes" ; then error_exit "static and pie are mutually incompatible" else @@ -2483,8 +2486,12 @@ if test "$mingw32" = yes; then else glib_req_ver=2.12 fi +glib_modules=gthread-2.0 +if test "$modules" = yes; then + glib_modules="$glib_modules gmodule-2.0" +fi -for i in gthread-2.0 gmodule-2.0; do +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` diff --git a/util/module.c b/util/module.c index 42bc3732c9..dc08c16111 100644 --- a/util/module.c +++ b/util/module.c @@ -14,7 +14,9 @@ */ #include <stdlib.h> +#ifdef CONFIG_MODULES #include <gmodule.h> +#endif #include "qemu-common.h" #include "qemu/queue.h" #include "qemu/module.h" |