FL-254: We had to unset ARCH. Back up to REAL_ARCH so we can test aga…

…inst it later.
funtoo · Dec 5, 2012 · f7ac5e7 · f7ac5e7
1 parent 7a1b08d
commit f7ac5e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sys-kernel/debian-sources/debian-sources-3.2.23.ebuild b/sys-kernel/debian-sources/debian-sources-3.2.23.ebuild
@@ -55,6 +55,7 @@ get_patch_list() {
 }
 
 pkg_setup() {
+	export REAL_ARCH="$ARCH"
 	unset ARCH; unset LDFLAGS #will interfere with Makefile if set
 }
 
@@ -84,7 +85,7 @@ src_prepare() {
 	local opts
 	use rt && opts="rt" || opts="standard"
 	local myarch="amd64"
-	[ "$ARCH" = "x86" ] && myarch="i386" && opts="$opts 686-pae"
+	[ "$REAL_ARCH" = "x86" ] && myarch="i386" && opts="$opts 686-pae"
 	cp ${FILESDIR}/config-extract . || die
 	chmod +x config-extract || die
 	./config-extract ${myarch} ${opts} || die

diff --git a/sys-kernel/debian-sources/debian-sources-3.2.29.ebuild b/sys-kernel/debian-sources/debian-sources-3.2.29.ebuild
@@ -55,6 +55,7 @@ get_patch_list() {
 }
 
 pkg_setup() {
+	export REAL_ARCH="$ARCH"
 	unset ARCH; unset LDFLAGS #will interfere with Makefile if set
 }
 
@@ -84,7 +85,7 @@ src_prepare() {
 	local opts
 	use rt && opts="rt" || opts="standard"
 	local myarch="amd64"
-	[ "$ARCH" = "x86" ] && myarch="i386" && opts="$opts 686-pae"
+	[ "$REAL_ARCH" = "x86" ] && myarch="i386" && opts="$opts 686-pae"
 	cp ${FILESDIR}/config-extract . || die
 	chmod +x config-extract || die
 	./config-extract ${myarch} ${opts} || die