From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53285)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1YIMlc-0007LO-8K
	for qemu-devel@nongnu.org; Mon, 02 Feb 2015 14:34:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1YIMlX-0004Sb-9O
	for qemu-devel@nongnu.org; Mon, 02 Feb 2015 14:34:40 -0500
Received: from mail-wg0-x236.google.com ([2a00:1450:400c:c00::236]:38951)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1YIMlX-0004SP-3Y
	for qemu-devel@nongnu.org; Mon, 02 Feb 2015 14:34:35 -0500
Received: by mail-wg0-f54.google.com with SMTP id b13so40575393wgh.13
	for <qemu-devel@nongnu.org>; Mon, 02 Feb 2015 11:34:34 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <54CFD146.6040602@redhat.com>
Date: Mon, 02 Feb 2015 20:34:30 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1421139239-13968-1-git-send-email-famz@redhat.com>
	<1421139239-13968-2-git-send-email-famz@redhat.com>
In-Reply-To: <1421139239-13968-2-git-send-email-famz@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2 1/2] configure: Default to enable module
	build
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org
Cc: Brian Jackson <iggy@theiggy.com>, Peter Maydell <peter.maydell@linaro.org>, Michael Tokarev <mjt@tls.msk.ru>, Stefan Hajnoczi <stefanha@redhat.com>, Bharata B Rao <bharata.rao@gmail.com>, =?windows-1252?Q?Andreas_F=E4rber?= <afaerber@suse.de>, Richard Henderson <rth@twiddle.net>



On 13/01/2015 09:53, Fam Zheng wrote:
> We have module build support around for a while, but also had it bitrot
> several times. It probably makes sense to enable it by default so that
> people can notice and use it.
> 
> Counterpart to --enable-modules, which is turned as default,
> --disable-modules is added to suppress it. If both are omitted, the
> support is guesses as usual.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

I squashed this to unbreak static compilation, but Peter reported that
module linking fails on ARM host:
  LINK  block/curl.so
/usr/bin/ld: block/curl.o: relocation R_ARM_THM_MOVW_ABS_NC against
`__stack_chk_guard' can not be used when making a shared object;
recompile with -fPIC
block/curl.o: could not read symbols: Bad value
collect2: error: ld returned 1 exit status

diff --git a/configure b/configure
index a9ae57a..4fae00a 100755
--- a/configure
+++ b/configure
@@ -1536,9 +1536,6 @@ 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
Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? y
@@ -2763,6 +2760,14 @@ fi
 module_try_enable()
 {
   force=$1
+  if test "$static" = "yes"; then
+    if $force; then
+      error_exit "static and modules are mutually incompatible"
+    else
+      modules="no"
+      return
+    fi
+  fi
   shacmd_probe="sha1sum sha1 shasum"
   for c in $shacmd_probe; do
     if has $c; then


Is the above ok?

Paolo