qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
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>,
	"Andreas Färber" <afaerber@suse.de>,
	"Richard Henderson" <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH v2 1/2] configure: Default to enable module build
Date: Mon, 02 Feb 2015 20:34:30 +0100	[thread overview]
Message-ID: <54CFD146.6040602@redhat.com> (raw)
In-Reply-To: <1421139239-13968-2-git-send-email-famz@redhat.com>



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

  parent reply	other threads:[~2015-02-02 19:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-13  8:53 [Qemu-devel] [PATCH v2 0/2] buildsys: Fix and enable module build Fam Zheng
2015-01-13  8:53 ` [Qemu-devel] [PATCH v2 1/2] configure: Default to " Fam Zheng
2015-01-15 16:28   ` Stefan Hajnoczi
2015-02-02 19:34   ` Paolo Bonzini [this message]
2015-02-03  1:29     ` Fam Zheng
2015-02-03  8:33       ` Paolo Bonzini
2015-01-13  8:53 ` [Qemu-devel] [PATCH v2 2/2] .travis.yml: Add "--disable-modules" Fam Zheng

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=54CFD146.6040602@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=afaerber@suse.de \
    --cc=bharata.rao@gmail.com \
    --cc=famz@redhat.com \
    --cc=iggy@theiggy.com \
    --cc=mjt@tls.msk.ru \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).