From patchwork Tue Jan 12 11:59:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 42708 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id B998810083C for ; Tue, 12 Jan 2010 23:03:21 +1100 (EST) Received: by ozlabs.org (Postfix) id 257C3B7C6F; Tue, 12 Jan 2010 23:03:13 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from gw1.transmode.se (gw1.transmode.se [213.115.205.20]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1857B7C6A for ; Tue, 12 Jan 2010 23:03:12 +1100 (EST) Received: from sesr04.transmode.se (sesr04.transmode.se [192.168.201.15]) by gw1.transmode.se (Postfix) with ESMTP id BF7C0650003; Tue, 12 Jan 2010 13:03:08 +0100 (CET) In-Reply-To: <20100112140136.c8ccc357.sfr@canb.auug.org.au> References: <20100112022150.GE12666@kryten> <20100112140136.c8ccc357.sfr@canb.auug.org.au> Subject: Re: [PATCH]: powerpc: Fix build breakage due to incorrect location of autoconf.h X-KeepSent: F0BABDB9:D573B5F9-C12576A9:0041BA69; type=4; name=$KeepSent To: Stephen Rothwell X-Mailer: Lotus Notes Release 8.5.1 September 28, 2009 Message-ID: From: Joakim Tjernlund Date: Tue, 12 Jan 2010 12:59:09 +0100 X-MIMETrack: Serialize by Router on sesr04/Transmode(Release 8.5.1|September 28, 2009) at 2010-01-12 13:03:08 MIME-Version: 1.0 Cc: Roel Kluin , linuxppc-dev@ozlabs.org, Richard Purdie , Anton Blanchard , Andrew Morton , David Woodhouse X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org > > Hi Anton, > > On Tue, 12 Jan 2010 13:21:51 +1100 Anton Blanchard wrote: > > > > commit ac4c2a3bbe5db5fc570b1d0ee1e474db7cb22585 (zlib: optimize inffast when > > copying direct from output) referenced include/linux/autoconf.h which > > is now called include/generated/autoconf.h. > > Even with this fix, you cannot build with a separate object directory. > See my other posting "linux-next: origin tree build failure" ... > -- How does this work for you? From 044f40d169bf5fe189d5cb058f56b7cd72675ca4 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Tue, 12 Jan 2010 11:20:36 +0100 Subject: [PATCH] powerpc: Fix build breakage due to incorrect location of autoconf.h commit ac4c2a3bbe5db5fc570b1d0ee1e474db7cb22585 (zlib: optimize inffast when copying direct from output) referenced include/linux/autoconf.h which is now called include/generated/autoconf.h. Also, -I include paths needs to be prefixed with $(srctree) Signed-off-by: Joakim Tjernlund --- arch/powerpc/boot/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.6.4.4 diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 826a30a..79ebd6f 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -34,8 +34,8 @@ BOOTCFLAGS += -fno-stack-protector endif BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) -BOOTCFLAGS += -include include/linux/autoconf.h -Iarch/powerpc/include -BOOTCFLAGS += -Iinclude +BOOTCFLAGS += -include include/generated/autoconf.h +BOOTCFLAGS += -I$(srctree)/arch/powerpc/include -I$(srctree)/include DTS_FLAGS ?= -p 1024