Cleanup somt things... push maskings into 64bit-default subprofile as that's the one that really needs protection.

author: Jeremy Huddleston <eradicator@gentoo.org> 2005-01-23 11:50:29 +0000
committer: Jeremy Huddleston <eradicator@gentoo.org> 2005-01-23 11:50:29 +0000
commit: 8e43623149de2b8d2842ff919d7b1e7b30cc5b56 (patch)
tree: 0e07f50a6cd82cd74091e03999fe85f91acb6102 /profiles
parent: Adding missing pcituils dependency; solves merge failures on bootstrapping. (diff)
download: gentoo-2-8e43623149de2b8d2842ff919d7b1e7b30cc5b56.tar.gz
gentoo-2-8e43623149de2b8d2842ff919d7b1e7b30cc5b56.tar.bz2
gentoo-2-8e43623149de2b8d2842ff919d7b1e7b30cc5b56.zip
7 files changed, 82 insertions, 15 deletions
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/make.defaults
new file mode 100644
index 000000000000..6ff331b3f154
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/make.defaults,v 1.1 2005/01/23 11:50:29 eradicator Exp $
+
+DEFAULT_ABI="sparc64"
diff --git a/profiles/default-linux/sparc/sparc64-multilib/package.mask b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/package.mask
index e8778b113e31..7a6d17e20a6d 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/package.mask
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/package.mask,v 1.1 2005/01/23 11:30:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/package.mask,v 1.1 2005/01/23 11:50:29 eradicator Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # multilib aware versions (install to & look in proper $(get_libdir))
@@ -11,3 +11,9 @@
 <net-libs/courier-authlib-0.52
 <sys-apps/iproute2-2.6.10.20050112
 <sys-devel/flex-2.5.4a-r6
+
+# sparc64 aware versions
+# this version of openssl always builds the 64bit version... when we get a
+# smarter portage, it will need to be updated
+<dev-libs/openssl-0.9.7d-r2
+
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/parent b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/parent
new file mode 100644
index 000000000000..74853ef4eaaf
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/parent
@@ -0,0 +1,8 @@
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/parent,v 1.2
+# 2004/03/18 00:16:43 seemant Exp $
+
+# This file describes the parent profile to this.  In most cases this will
+# just be the name of the parent directory
+..
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/profile.bashrc b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/profile.bashrc
new file mode 100644
index 000000000000..a573012feed2
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/64bit-default/profile.bashrc
@@ -0,0 +1,31 @@
+# lib64 sandbox stuff copied from amd64's profile.bashrc:
+# fix for bug 60147, "configure causes sandbox violations when lib64
+# is a directory". currently only works with cvs portage.
+
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
+
+# 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/
+
+# The version of profile in our 'packages' does not yet set ABI for us nor
+# export the CFLAGS_${ABI} envvars... The multilib-pkg patch does, but this
+# won't be in portage until atleast .52_pre
+if [ -n "${ABI}" ]; then
+	export ABI
+elif [ -n "${DEFAULT_ABI}" ]; then
+	export ABI="${DEFAULT_ABI}"
+else
+	export ABI="sparc32"
+fi
+
+export CFLAGS_sparc32
+export CFLAGS_sparc64
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
index 83c084838bba..5459d9623567 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
@@ -1,5 +1,32 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.17 2005/01/23 11:30:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.18 2005/01/23 11:50:29 eradicator Exp $
 
-DEFAULT_ABI="sparc64"
+FEATURES="sandbox ccache autoconfig multilib-pkg multilib-strict"
+
+# Catalyst stage/grp USE
+GRP_STAGE23_USE="berkdb gpm ipv6 -java multislot multilib ncurses nls -nptl pam perl python readline ssl tcpd zlib"
+
+# Sane, minimal USE settings
+USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups font-server fortran f77 fbcon gif jpeg nls opengl png tiff truetype truetype-fonts type1-fonts usb xpm xrandr xv"
+
+# Not all of this is implemented in portage/toolchain, yet. See 
+# http://bugs.gentoo.org/show_bug.cgi?id=75420
+
+# MULTILIB_ABIS lists all the ABIS you want to build for when
+# you emerge a package.  The libs that get installed will be for
+# all of these ABIs, but the bins will be for ${DEFAULT_ABI}.
+
+MULTILIB_ABIS="sparc32 sparc64"
+DEFAULT_ABI="sparc32"
+
+ARCH_WRAPPER_sparc64="sparc64"
+CFLAGS_sparc64="-m64"
+LIBDIR_sparc64="lib64"
+
+ARCH_WRAPPER_sparc32="sparc32"
+CFLAGS_sparc32="-m32"
+LIBDIR_sparc32="lib"
+
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit.*shared object"
diff --git a/profiles/default-linux/sparc/sparc64-multilib/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/make.defaults
index 2e4c2b97458c..362e32fc835e 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/make.defaults
@@ -1,12 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/make.defaults,v 1.3 2004/12/31 11:42:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/make.defaults,v 1.4 2005/01/23 11:50:29 eradicator Exp $
 
 # 64bit kernel, 32/64bit multilib userland 
 CHOST="sparc64-unknown-linux-gnu"
 PROFILE_ARCH="sparc64-multilib"
-
-# Make sure multilib is on
-STAGE1_USE="multilib"
-GRP_STAGE23_USE="${STAGE1_USE}"
-USE="${GRP_STAGE23_USE}"
diff --git a/profiles/default-linux/sparc/sparc64-multilib/packages b/profiles/default-linux/sparc/sparc64-multilib/packages
index 74d1b3cc7a9d..a6102ef04426 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/packages
+++ b/profiles/default-linux/sparc/sparc64-multilib/packages
@@ -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/sparc/sparc64-multilib/packages,v 1.16 2005/01/23 11:30:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.17 2005/01/23 11:50:29 eradicator Exp $
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
@@ -18,8 +18,3 @@
 *>=sys-libs/glibc-2.3.4.20040808-r1
 *>=sys-devel/gcc-config-1.3.9
 >=sys-devel/distcc-2.18.3-r1
-
-# sparc64 aware versions
-# this version of openssl always builds the 64bit version... when we get a
-# smarter portage, it will need to be updated
->=dev-libs/openssl-0.9.7d-r2
author	Jeremy Huddleston <eradicator@gentoo.org>	2005-01-23 11:50:29 +0000
committer	Jeremy Huddleston <eradicator@gentoo.org>	2005-01-23 11:50:29 +0000
commit	8e43623149de2b8d2842ff919d7b1e7b30cc5b56 (patch)
tree	0e07f50a6cd82cd74091e03999fe85f91acb6102 /profiles
parent	Adding missing pcituils dependency; solves merge failures on bootstrapping. (diff)
download	gentoo-2-8e43623149de2b8d2842ff919d7b1e7b30cc5b56.tar.gz gentoo-2-8e43623149de2b8d2842ff919d7b1e7b30cc5b56.tar.bz2 gentoo-2-8e43623149de2b8d2842ff919d7b1e7b30cc5b56.zip