[patch] portage-2.0.49-r18_ebuild.patch

portage-2.0.49-r18_ebuild.patch (text/plain), 1.24 KB, created by Martin Schlemmer (RETIRED) on 2003-12-14 12:54:39 UTC

Index: portage-2.0.49-r18.ebuild
===================================================================
RCS file: /home/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r18.ebuild,v
retrieving revision 1.4
diff -u -r1.4 portage-2.0.49-r18.ebuild
--- portage-2.0.49-r18.ebuild	7 Dec 2003 06:06:50 -0000	1.4
+++ portage-2.0.49-r18.ebuild	14 Dec 2003 20:53:30 -0000
@@ -33,17 +33,19 @@
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	
+	cd ${S}/src/sandbox-1.1
+	epatch ${FILESDIR}/sandbox-amd64-fixes-4.patch
 }
 
 src_compile() {
+	SB_CFLAGS="$(echo "${CFLAGS}" | \
+		sed -e 's:.*\(-march=[^[:space:]\"]*\).*:\1:p; t exit; s:.*\(-mcpu=[^[:space:]\"]*\).*:\1:p; :exit; D')"
+
 	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
 	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
-		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
-		make || die
-	fi
+	make CFLAGS="${SB_CFLAGS} -O1 -pipe" \
+		HAVE_64BIT_ARCH="$(use amd64 && use multilib)" || die
 	cd ${S}/bin
 }
 
@@ -111,7 +113,9 @@
 
 	#install sandbox
 	cd ${S}/src/sandbox-1.1
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
+	make DESTDIR=${D} \
+		HAVE_64BIT_ARCH="$(use amd64 && use multilib)" \
+		install || die "Failed to compile sandbox"
 
 	#symlinks
 	dodir /usr/bin /usr/sbin