Patchwork powerpc: fix rare boot build breakage

login
register
mail settings
Submitter Hugh Dickins
Date Sept. 6, 2008, 11:35 p.m.
Message ID <Pine.LNX.4.64.0809070031440.5065@blonde.site>
Download mbox | patch
Permalink /patch/193/
State Accepted
Commit 4ff23fa93011e2367fea056e72c92709178972d9
Headers show

Comments

Hugh Dickins - Sept. 6, 2008, 11:35 p.m.
A make -j20 powerpc kernel build broke a couple of months ago saying:
In file included from arch/powerpc/boot/gunzip_util.h:13,
                 from arch/powerpc/boot/prpmc2800.c:21:
arch/powerpc/boot/zlib.h:85: error: expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘*’ token
arch/powerpc/boot/zlib.h:630: warning: type defaults to ‘int’ in declaration of ‘Byte’
arch/powerpc/boot/zlib.h:630: error: expected ‘;’, ‘,’ or ‘)’ before ‘*’ token

It happened again yesterday: too rare for me to confirm the fix, but
it looks like the list of dependants on gunzip_util.h was incomplete.

Signed-off-by: Hugh Dickins <hugh@veritas.com>

Patch

--- 2.6.27-rc5/arch/powerpc/boot/Makefile	2008-07-29 04:24:27.000000000 +0100
+++ linux/arch/powerpc/boot/Makefile	2008-09-06 18:28:29.000000000 +0100
@@ -49,7 +49,7 @@  zlib       := inffast.c inflate.c inftre
 zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
 zliblinuxheader := zlib.h zconf.h zutil.h
 
-$(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
+$(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o prpmc2800.o): \
 	$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
 
 src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c