From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr8Bd-0005ap-Qb for qemu-devel@nongnu.org; Wed, 10 Aug 2011 08:47:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qr8Bb-0008Nl-0G for qemu-devel@nongnu.org; Wed, 10 Aug 2011 08:47:05 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:47555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr8Ba-0008NB-M2 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 08:47:02 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7ACRPSe027244 for ; Wed, 10 Aug 2011 06:27:25 -0600 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7ACkqVS126650 for ; Wed, 10 Aug 2011 06:46:54 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7ACkpXF018824 for ; Wed, 10 Aug 2011 06:46:51 -0600 Message-ID: <4E427DBA.2090709@linux.vnet.ibm.com> Date: Wed, 10 Aug 2011 07:46:50 -0500 From: Michael Roth MIME-Version: 1.0 References: <7d7114c0f2ebea6cf24689d9e58e6494d1b8a463.1312970654.git.jdenemar@redhat.com> In-Reply-To: <7d7114c0f2ebea6cf24689d9e58e6494d1b8a463.1312970654.git.jdenemar@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH STABLE] build: Move QEMU_INCLUDES before QEMU_CFLAGS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jiri Denemark Cc: qemu-devel@nongnu.org On 08/10/2011 05:04 AM, Jiri Denemark wrote: > This patch fixes build when any of the include paths from QEMU_CFLAGS > contains a header file with similar name to a header file in qemu > sources. I hit it with error.h included by qapi/qapi-types-core.h. GCC > decided to use /usr/include/alsa/error.h instead of qemu's error.h. > > Signed-off-by: Jiri Denemark > --- > rules.mak | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/rules.mak b/rules.mak > index 612ae37..1a2622c 100644 > --- a/rules.mak > +++ b/rules.mak > @@ -15,21 +15,21 @@ MAKEFLAGS += -rR > QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d > > %.o: %.c > - $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") > + $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") > > ifeq ($(LIBTOOL),) > %.lo: %.c > @echo "missing libtool. please install and rerun configure"; exit 1 > else > %.lo: %.c > - $(call quiet-command,libtool --mode=compile --quiet --tag=CC $(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") > + $(call quiet-command,libtool --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") > endif > > %.o: %.S > - $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") > + $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") > > %.o: %.m > - $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") > + $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") > > LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(LIBS)," LINK $(TARGET_DIR)$@") > Nice, didn't realize the fix was that straightforward. Tested-by: Michael Roth