summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-09-12 10:35:12 +0000
committerTravis Tilley <lv@gentoo.org>2004-09-12 10:35:12 +0000
commitca8350fa74d53c30461dab4eaac66ce1ba78911d (patch)
treeae86754c04992885045c17629c0a38b91e264a5d /profiles/default-linux
parentAdded nxproxy dep (Manifest recommit) (diff)
downloadgentoo-2-ca8350fa74d53c30461dab4eaac66ce1ba78911d.tar.gz
gentoo-2-ca8350fa74d53c30461dab4eaac66ce1ba78911d.tar.bz2
gentoo-2-ca8350fa74d53c30461dab4eaac66ce1ba78911d.zip
profile.bashrc cascades now, so remove subprofile bashrcs
Diffstat (limited to 'profiles/default-linux')
-rw-r--r--profiles/default-linux/amd64/2004.3/lib64/make.defaults6
-rw-r--r--profiles/default-linux/amd64/2004.3/lib64/profile.bashrc41
-rw-r--r--profiles/default-linux/amd64/2004.3/make.defaults6
-rw-r--r--profiles/default-linux/amd64/2004.3/profile.bashrc43
4 files changed, 10 insertions, 86 deletions
diff --git a/profiles/default-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index 88b2e475fb7f..51516a7468c1 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
@@ -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/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.4 2004/09/09 19:25:42 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.5 2004/09/12 10:35:12 lv Exp $
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
@@ -16,3 +16,7 @@ ARCH="amd64"
# we can enable sandbox now that we use multilib by default
FEATURES="sandbox"
+
+CONF_LIBDIR="lib64"
+CONF_MULTILIBDIR="lib32"
+
diff --git a/profiles/default-linux/amd64/2004.3/lib64/profile.bashrc b/profiles/default-linux/amd64/2004.3/lib64/profile.bashrc
deleted file mode 100644
index b84b12d3250c..000000000000
--- a/profiles/default-linux/amd64/2004.3/lib64/profile.bashrc
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-
-
-# currently theoretical multilib stuff only available if using portage 2.0.51
-CHOST32="i686-pc-linux-gnu"
-CONF_MULTILIBDIR="${CONF_MULTILIBDIR:=lib32}"
-CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
-ARCH_WRAPPER="linux32"
-CC32="gcc32"
-CPP32="g++32"
-
-
-setup_multilib_variables() {
- # if run via linux32, uname -m will always return i686
- if [ "$(uname -m)" == "i686" ] ; then
- CONF_LIBDIR="${CONF_MULTILIBDIR:=lib32}"
- CHOST="${CHOST32:=i686-pc-linux-gnu}"
-
- if [ -x /usr/bin/${CC32:=gcc32} ] ; then
- CC="${CC32:=gcc32}"
- CPP="${CPP32:=g++32}"
- else
- CFLAGS="${CFLAGS} -m32"
- CXXFLAGS="${CXXFLAGS} -m32"
- fi
- else
- # this isnt needed for profiles that set CONF_LIBDIR, but it
- # doesnt hurt to be safe.
- CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
- fi
-
- export CONF_LIBDIR
-}
-
-[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
-[ "${CONF_MULTILIBDIR}" == "lib" -a "${CONF_LIBDIR}" == "lib64" ] && SKIP_MULTILIB_HACK="YES"
-
diff --git a/profiles/default-linux/amd64/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index 33d51c28b674..9cb8f8851667 100644
--- a/profiles/default-linux/amd64/2004.3/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/make.defaults
@@ -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/profiles/default-linux/amd64/2004.3/make.defaults,v 1.4 2004/09/09 19:25:42 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.5 2004/09/12 10:35:12 lv Exp $
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
@@ -16,3 +16,7 @@ ARCH="amd64"
# we can enable sandbox now that we use multilib by default
FEATURES="sandbox"
+
+CONF_LIBDIR="lib"
+CONF_MULTILIBDIR="lib32"
+
diff --git a/profiles/default-linux/amd64/2004.3/profile.bashrc b/profiles/default-linux/amd64/2004.3/profile.bashrc
deleted file mode 100644
index 2f76cea90a54..000000000000
--- a/profiles/default-linux/amd64/2004.3/profile.bashrc
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-
-
-# currently theoretical multilib stuff only available if using portage 2.0.51
-CHOST32="i686-pc-linux-gnu"
-CONF_MULTILIBDIR="${CONF_MULTILIBDIR:=lib32}"
-# until everything in the tree understands $(get_libdir), the only sane
-# default for this is lib.
-CONF_LIBDIR="${CONF_LIBDIR:=lib}"
-ARCH_WRAPPER="linux32"
-CC32="gcc32"
-CPP32="g++32"
-
-
-setup_multilib_variables() {
- # if run via linux32, uname -m will always return i686
- if [ "$(uname -m)" == "i686" ] ; then
- CONF_LIBDIR="${CONF_MULTILIBDIR:=lib32}"
- CHOST="${CHOST32:=i686-pc-linux-gnu}"
-
- if [ -x /usr/bin/${CC32:=gcc32} ] ; then
- CC="${CC32:=gcc32}"
- CPP="${CPP32:=g++32}"
- else
- CFLAGS="${CFLAGS} -m32"
- CXXFLAGS="${CXXFLAGS} -m32"
- fi
- else
- # this isnt needed for profiles that set CONF_LIBDIR, but it
- # doesnt hurt to be safe.
- CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
- fi
-
- export CONF_LIBDIR
-}
-
-[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
-[ "${CONF_MULTILIBDIR}" == "lib" -a "${CONF_LIBDIR}" == "lib64" ] && SKIP_MULTILIB_HACK="YES"
-