From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:46047)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qrs3z-0000ui-4b
	for qemu-devel@nongnu.org; Fri, 12 Aug 2011 09:46:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qrs3y-0000TG-7K
	for qemu-devel@nongnu.org; Fri, 12 Aug 2011 09:46:15 -0400
Received: from mail-gw0-f45.google.com ([74.125.83.45]:61216)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qrs3y-0000TB-2B
	for qemu-devel@nongnu.org; Fri, 12 Aug 2011 09:46:14 -0400
Received: by gwb19 with SMTP id 19so2305400gwb.4
	for <qemu-devel@nongnu.org>; Fri, 12 Aug 2011 06:46:13 -0700 (PDT)
Message-ID: <4E452EA1.2070709@codemonkey.ws>
Date: Fri, 12 Aug 2011 08:46:09 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
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: <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: Jiri Denemark <jdenemar@redhat.com>
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.

Applied to master.  Thanks.

Regards,

Anthony Liguori

>
> Signed-off-by: Jiri Denemark<jdenemar@redhat.com>
> ---
>   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)$@")
>