From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1GxT9y-0001nN-QA
	for qemu-devel@nongnu.org; Thu, 21 Dec 2006 14:00:54 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1GxT9w-0001k7-Ux
	for qemu-devel@nongnu.org; Thu, 21 Dec 2006 14:00:54 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1GxT9w-0001jM-Kf
	for qemu-devel@nongnu.org; Thu, 21 Dec 2006 14:00:52 -0500
Received: from [193.7.176.60] (helo=mail.bawue.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1GxT9v-0000We-UZ
	for qemu-devel@nongnu.org; Thu, 21 Dec 2006 14:00:52 -0500
Received: from lagash (p54A47735.dip.t-dialin.net [84.164.119.53])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.bawue.net (Postfix) with ESMTP id C6E3AB9A46
	for <qemu-devel@nongnu.org>; Thu, 21 Dec 2006 19:59:51 +0100 (CET)
Received: from ths by lagash with local (Exim 4.63)
	(envelope-from <ths@networkno.de>) id 1GxT9X-00033N-LZ
	for qemu-devel@nongnu.org; Thu, 21 Dec 2006 19:00:27 +0000
Date: Thu, 21 Dec 2006 19:00:27 +0000
Message-ID: <20061221190027.GA7239@networkno.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
From: Thiemo Seufer <ths@networkno.de>
Subject: [Qemu-devel] [PATCH] Fix some configure/Makefile weirdness
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Hello All,

the appended patch allows for propagating CFLAGS and LDFLAGS to the host
Makefile. This reactivates the (undocumented) --extra-cflags= and
--extra-ldflags= options of configure which are currently NOPs.
It also removes the CFLAGS=-O2 default from configure since it is
already hardcoded in Makefile and Makefile.target.

Comments?


Thiemo


Index: Makefile
===================================================================
RCS file: /sources/qemu/qemu/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile	5 Aug 2006 21:29:27 -0000	1.106
+++ Makefile	21 Dec 2006 18:48:34 -0000
@@ -5,14 +5,14 @@ include config-host.mak
 .PHONY: all clean distclean dvi info install install-doc tar tarbin \
 	speed test test2 html dvi info
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
+CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
 ifeq ($(ARCH),sparc)
 CFLAGS+=-mcpu=ultrasparc
 endif
-LDFLAGS=-g
+LDFLAGS+=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 TOOLS=qemu-img$(EXESUF)
Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.113
diff -u -p -r1.113 configure
--- configure	19 Dec 2006 03:31:34 -0000	1.113
+++ configure	21 Dec 2006 18:48:34 -0000
@@ -243,11 +243,6 @@ for opt do
   esac
 done
 
-# Checking for CFLAGS
-if test -z "$CFLAGS"; then
-    CFLAGS="-O2"
-fi
-
 if test x"$show_help" = x"yes" ; then
 cat << EOF