should fix #107177

2 files changed, 33 insertions, 31 deletions

diff --git a/profiles/selinux/2005.1/amd64/make.defaults b/profiles/selinux/2005.1/amd64/make.defaults
index 3b9328eb0409..af217bf7b4c5 100644
--- a/profiles/selinux/2005.1/amd64/make.defaults
+++ b/profiles/selinux/2005.1/amd64/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/make.defaults,v 1.3 2005/09/26 02:32:26 pebenito Exp $
 
-USE="amd64 emul-linux-x86 multilib"
-STAGE1_USE="amd64 multilib"
-GRP_STAGE23_USE="amd64 multilib"
+USE="amd64 emul-linux-x86"
+STAGE1_USE="amd64"
+GRP_STAGE23_USE="amd64"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
@@ -13,19 +13,24 @@ CHOST="x86_64-pc-linux-gnu"
 CFLAGS="-march=x86-64 -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 
-#FEATURES="sandbox"
+# This profile doesn't fully support multilib portage yet.  We still rely
+# on the emul-* packages.  As such, we have -multilib-pkg here to emphasise
+# that point.
+FEATURES="-multilib-pkg"
 
 MULTILIB_ABIS="x86 amd64"
 DEFAULT_ABI="amd64"
 
-CFLAGS_amd64="-m64"
-LDFLAGS_amd64="-m elf_x86_64"
+#CFLAGS_amd64="-m64"
+#LDFLAGS_amd64="-m elf_x86_64"
 CHOST_amd64="x86_64-pc-linux-gnu"
 CDEFINE_amd64="__x86_64__"
 LIBDIR_amd64="lib64"
 
-CFLAGS_x86="-m32"
-LDFLAGS_x86="-m elf_i386"
+# Added -L/emul* workaround to aid compilation of 32bit packages
+# See bug #88725 for more info - Herbie Hopkins <herbs@gentoo.org> 2005/04/19
+CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
 CHOST_x86="i686-pc-linux-gnu"
 CDEFINE_x86="__i386__"
 LIBDIR_x86="lib32"
@@ -33,6 +38,7 @@ LIBDIR_x86="lib32"
 # In case someone wants to help out by setting FEATURES="multilib-strict"
 MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
 MULTILIB_STRICT_DENY="64-bit.*shared object"
+MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3)"
 
 # Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
 SYMLINK_LIB="yes"
diff --git a/profiles/selinux/2005.1/amd64/profile.bashrc b/profiles/selinux/2005.1/amd64/profile.bashrc
index b7328061f503..58e289ebaed9 100644
--- a/profiles/selinux/2005.1/amd64/profile.bashrc
+++ b/profiles/selinux/2005.1/amd64/profile.bashrc
@@ -1,26 +1,22 @@
-# fix for bug 60147, "configure causes sandbox violations when lib64
-# is a directory". currently only works with cvs portage.
-#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
-addwrite /usr/lib64/conftest
-addwrite /usr/lib64/cf
+# The version of profile in our 'packages' does not yet set ABI for us nor
+# export the CFLAGS_${ABI} envvars...
 
-# oh goodie, yet ANOTHER sandbox bug!!!! >:|
-# without portage 2.0.51 and the following entries, at least dbus will spew
-# sandbox violations like mad with python in lib64.
-addpredict /usr/lib64/python2.0/
-addpredict /usr/lib64/python2.1/
-addpredict /usr/lib64/python2.2/
-addpredict /usr/lib64/python2.3/
-addpredict /usr/lib64/python2.4/
-addpredict /usr/lib64/python2.5/
-addpredict /usr/lib64/python3.0/
+if [[ -n "${ABI}" ]]; then
+	export ABI
+elif [[ -n "${DEFAULT_ABI}" ]]; then
+	export ABI="${DEFAULT_ABI}"
+else
+	export ABI="amd64"
+fi
 
-# sandbox is disabled for /dev/null by default, so this bug isnt caught.
-# hopefully this will help us figure out where this problem occurs...
-if [ ! -e /dev/null ] ; then
-	eerror "/dev/null doesnt exist! this is bad! tail -n 20 /var/log/emerge.log and attach the output to http://bugs.gentoo.org/show_bug.cgi?id=65876"
-	exit 1
-elif [ -f /dev/null ] ; then
-	eerror "/dev/null is a normal file! this is bad! tail -n 20 /var/log/emerge.log and attach the output to http://bugs.gentoo.org/show_bug.cgi?id=65876"
+#export CFLAGS_amd64
+export CFLAGS_x86
+
+# Make sure they updated to 2005.0 properly
+if [[ (-L /lib32 || -L /usr/lib32 ) && ( ${PORTAGE_CALLER} != "repoman" ) ]] ; then
+	eerror "It appears you have switched to the 2005.1 profile without following"
+	eerror "the upgrade guide.  Please  upgrade to 2005.0 first. See the following"
+	eerror "URL for more information:"
+	eerror "http://www.gentoo.org/proj/en/base/amd64/howtos/2005.0-upgrade-amd64.xml"
 	exit 1
 fi