make sure we install into correct dir when cross compiling

2 files changed, 27 insertions, 19 deletions

diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index a74ef24115e1..df32b46b4221 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -7,7 +7,7 @@ MD5 89403525f4da5e8458fd7f720d6de6ee linux26-headers-2.6.6-r1.ebuild 4223
 MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
 MD5 b3d1c41a74dbe1041b4082288cacd3ca linux26-headers-2.6.7-r4.ebuild 4031
 MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188
-MD5 d0cb7106bf3a5f6266aefe15553df50a linux26-headers-2.6.8.1-r1.ebuild 4534
+MD5 2678f0e32102e6c17fa39d10e8cdcb72 linux26-headers-2.6.8.1-r1.ebuild 4748
 MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1 68
 MD5 14a0de85d11206096f05e186cebab07b files/linux26-headers-2.6.8.1-appCompat.patch 53549
 MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086
@@ -31,7 +31,7 @@ MD5 9f83b3bf65ac599e58c5b96ed2569963 files/linux26-headers-2.6.8.1-sparc-signal_
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBrzUproRuSHgZdywRAg0PAJ9Qh+Kis5mhtz3R5GtTMHQLAfWEWgCeI3tu
-/wPCWxv1Q2HeRl5xTTO8Ae4=
-=OgRn
+iD8DBQFBsL3ZroRuSHgZdywRAhgeAJ4zVFDT29mP0weX6B5EMyVWlBcy/ACdEbWP
+7/03eysGBE+qydWf9g72xgE=
+=B79v
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
index 248a8035ccf8..122cb384f23d 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.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.8.1-r1.ebuild,v 1.11 2004/12/02 15:30:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.12 2004/12/03 19:25:53 vapier Exp $
 
 # What's in this kernel?
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="${CTARGET}"
-KEYWORDS="-* amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc sh ~x86"
+KEYWORDS="-* amd64 arm hppa ia64 ~ppc ppc64 ~sparc sh x86"
 IUSE=""
 
 DEPEND="!virtual/os-headers"
@@ -84,13 +84,21 @@ src_compile() {
 	[ -f "${ROOT}"/usr/include/linux/autoconf.h ] \
 		|| touch include/linux/autoconf.h
 
+	# When cross-compiling, we need to set the CROSS_COMPILE var properly
+	local extra_makeopts=
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		extra_makeopts="CROSS_COMPILE=${CTARGET}-"
+	fi
+
 	# if there arent any installed headers, then there also isnt an asm
 	# symlink in /usr/include/, and make defconfig will fail, so we have
 	# to force an include path with $S.
+	local HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/"
+
 	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/" || die "defconfig failed"
-	make prepare HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" || die "prepare failed"
+	make defconfig HOSTCFLAGS="${HOSTCFLAGS}" ${extra_makeopts} || die "defconfig failed"
+	make prepare HOSTCFLAGS="${HOSTCFLAGS}" ${extra_makeopts} || die "prepare failed"
 	set_arch_to_portage
 }
 
@@ -100,17 +108,17 @@ src_install() {
 
 	# If this is sparc, then we need to place asm_offsets.h in the proper location(s)
 	if [ "${PROFILE_ARCH}" = "sparc64" ] ; then
-		# We don't need /usr/include/asm, generate-asm-sparc will take care of this
-		rm -Rf ${D}/usr/include/asm
+		# We don't need the asm dir, generate-asm-sparc will take care of this
+		rm -Rf ${D}/${LINUX_INCDIR}/asm
 
 		# We do need empty directories, though...
-		dodir /usr/include/asm
-		dodir /usr/include/asm-sparc
-		dodir /usr/include/asm-sparc64
+		dodir ${LINUX_INCDIR}/asm
+		dodir ${LINUX_INCDIR}/asm-sparc
+		dodir ${LINUX_INCDIR}/asm-sparc64
 
 		# Copy asm-sparc and asm-sparc64
-		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
-		cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64
+		cp -ax ${S}/include/asm-sparc/* ${D}/${LINUX_INCDIR}/asm-sparc
+		cp -ax ${S}/include/asm-sparc64/* ${D}/${LINUX_INCDIR}/asm-sparc64
 
 		# Check if generate-asm-sparc exists
 		if [ -a "${FILESDIR}/generate-asm-sparc" ]; then
@@ -122,8 +130,8 @@ src_install() {
 				chmod +x ${WORKDIR}/generate-asm-sparc
 			fi
 
-			# Generate /usr/include/asm for sparc systems
-			${WORKDIR}/generate-asm-sparc ${D}/usr/include
+			# Generate asm for sparc systems
+			${WORKDIR}/generate-asm-sparc ${D}/${LINUX_INCDIR}
 		else
 			eerror "${FILESDIR}/generate-asm-sparc doesn't exist!"
 			die
@@ -132,8 +140,8 @@ src_install() {
 
 	# If this is 2.5 or 2.6 headers, then we need asm-generic too
 	if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then
-		dodir /usr/include/asm-generic
-		cp -ax ${S}/include/asm-generic/* ${D}/usr/include/asm-generic
+		dodir ${LINUX_INCDIR}/asm-generic
+		cp -ax ${S}/include/asm-generic/* ${D}/${LINUX_INCDIR}/asm-generic
 	fi
 }