From patchwork Wed Apr 3 10:32:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3F9812C00AD for ; Wed, 3 Apr 2013 21:35:23 +1100 (EST) Received: from localhost ([::1]:33191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNL2H-0003Bh-BV for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 06:35:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzc-0001As-Pi for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNKza-0004Ln-FZ for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:36 -0400 Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]:38651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKza-0004LW-99 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:34 -0400 Received: by mail-wg0-f41.google.com with SMTP id y10so4057744wgg.0 for ; Wed, 03 Apr 2013 03:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=v5NQklYwYV13CtE79vpLSLa2ZUzTPqCvfToJazSVQhM=; b=k3MoshLPhfXgZZdYkjZgDFciQQIVWHR44PIXKqivwXp6tG/sv2fW7OZtiXqMu0lA5P ybQbEsOVXmGG1TNASW0iAI6dK/BAHU6/rT/7pG8bt97efwfm3VAv26MzCnFyianxV80O LkKTTgh3mOQRu2KjkGZB6sUOkbLs1jwoVJWu2pkttdLPLwq7dJXT38hFn4xkb0QE/Jat 8u2s8X34y+/RvAWtIF1FJpP82HipwiXaDDBDL3qPa2K+spFl3XckySOvGts0R3hSmF86 BFdIuzgVUvn4xKzQ0NWMe2E+jcJv3lB0t4LJiIbmUYjbckNaOXygzlJTD46uCKaVSySt /ygQ== X-Received: by 10.181.11.164 with SMTP id ej4mr1861891wid.29.1364985153610; Wed, 03 Apr 2013 03:32:33 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id dm9sm24010369wib.3.2013.04.03.03.32.31 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 03:32:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2013 12:32:07 +0200 Message-Id: <1364985128-23772-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364985128-23772-1-git-send-email-pbonzini@redhat.com> References: <1364985128-23772-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::229 Cc: aurelien@aurel32.net, pmaydell@linaro.org Subject: [Qemu-devel] [PATCH v2 09/10] configure: move common libraries to config-host.mak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move -lm to the end of the line, so that it can be picked up as a dependency by pixman. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- Makefile.target | 10 +++++----- configure | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index 2bd6d14..2636103 100644 --- a/Makefile.target +++ b/Makefile.target @@ -31,10 +31,6 @@ PROGS+=$(QEMU_PROGW) endif STPFILES= -ifndef CONFIG_HAIKU -LIBS+=-lm -endif - config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak @@ -119,7 +115,7 @@ obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o -LIBS+=-lz +LIBS+=$(libs_softmmu) # xen support obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o @@ -149,6 +145,10 @@ include $(SRC_PATH)/Makefile.objs all-obj-y = $(obj-y) all-obj-y += $(addprefix ../, $(common-obj-y)) +ifndef CONFIG_HAIKU +LIBS+=-lm +endif + ifdef QEMU_PROGW # The linker builds a windows executable. Make also a console executable. $(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a diff --git a/configure b/configure index 7d83600..c8d47fe 100755 --- a/configure +++ b/configure @@ -1455,6 +1455,7 @@ EOF exit 1 fi fi +libs_softmmu="$libs_softmmu -lz" ########################################## # libseccomp check @@ -3479,6 +3480,7 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak echo "qemu_localedir=$qemu_localedir" >> $config_host_mak +echo "libs_softmmu=$libs_softmmu" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak @@ -4190,7 +4192,7 @@ if test "$target_bigendian" = "yes" ; then fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_target_mak - echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak + echo "LIBS+=$target_libs_softmmu" >> $config_target_mak case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak