run make prepare #57664

3 files changed, 48 insertions, 3 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index f40857078336..b4acdb93d838 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.10 2004/07/19 19:00:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.11 2004/07/20 15:12:27 vapier Exp $
+
+  20 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/linux26-headers-2.6.7-generic-arm-prepare.patch,
+  linux26-headers-2.6.7-r3.ebuild:
+  Move the appCompat patch to the end of src_compile() because it breaks the
+  `make prepare` step which is needed by some architectures #57664.
 
   19 Jul 2004; Mike Frysinger <vapier@gentoo.org>
   linux26-headers-2.6.7-r3.ebuild:
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-generic-arm-prepare.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-generic-arm-prepare.patch
new file mode 100644
index 000000000000..83aa773f4275
--- /dev/null
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-generic-arm-prepare.patch
@@ -0,0 +1,35 @@
+--- linux-2.6.7/include/asm-arm/glue.h	2004-07-19 01:35:04.000000000 -0400
++++ linux-2.6.7/include/asm-arm/glue.h	2004-07-20 10:24:37.812214000 -0400
+@@ -107,8 +107,5 @@
+ # endif
+ #endif
+ 
+-#ifndef CPU_ABORT_HANDLER
+-#error Unknown data abort handler type
+-#endif
+ 
+ #endif
+--- linux-2.6.7/include/asm-arm/cacheflush.h	2004-07-19 01:35:04.000000000 -0400
++++ linux-2.6.7/include/asm-arm/cacheflush.h	2004-07-20 10:29:49.292214000 -0400
+@@ -77,9 +77,6 @@
+ //# endif
+ #endif
+ 
+-#if !defined(_CACHE) && !defined(MULTI_CACHE)
+-#error Unknown cache maintainence model
+-#endif
+ 
+ /*
+  * This flag is used to indicate that the page pointed to by a pte
+--- linux-2.6.7/include/asm-arm/page.h	2004-07-19 01:35:04.000000000 -0400
++++ linux-2.6.7/include/asm-arm/page.h	2004-07-20 10:28:36.542214000 -0400
+@@ -92,9 +92,6 @@
+ # endif
+ #endif
+ 
+-#ifndef _USER
+-#error Unknown user operations model
+-#endif
+ 
+ struct cpu_user_fns {
+ 	void (*cpu_clear_user_page)(void *p, unsigned long user);
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
index 36eed0660181..3cbbcc213c48 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.2 2004/07/19 19:00:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.3 2004/07/20 15:12:27 vapier Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -47,10 +47,10 @@ src_unpack() {
 	kernel_universal_unpack
 
 	# User-space patches for various things
-	epatch ${FILESDIR}/${PN}-2.6.7-appCompat.patch
 	epatch ${FILESDIR}/${PN}-2.6.3-strict-ansi-fix.patch
 	epatch ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch
 	epatch ${FILESDIR}/${PN}-2.6.0-fb.patch
+	epatch ${FILESDIR}/${PN}-2.6.7-generic-arm-prepare.patch
 }
 
 src_compile() {
@@ -63,7 +63,11 @@ src_compile() {
 	set_arch_to_kernel
 	ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
 	make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/"
+	make prepare || die "prepare failed"
 	set_arch_to_portage
+
+	# this must happen after `make prepare`
+	epatch ${FILESDIR}/${PN}-2.6.7-appCompat.patch
 }
 
 src_install() {