multilib-strict additions

diff --git a/profiles/default-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index d5c658b1762b42fe65f15e7e93617d61ac75a669..9384c881a8725f7918e017594b5c17ed216a39cb 100644 (file)
--- 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.12 2005/01/01 00:30:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.13 2005/01/05 08:10:19 eradicator Exp $
 
 # GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
 # for compatibility
@@ -15,3 +15,8 @@ FEATURES="sandbox autoconfig"
 CONF_LIBDIR="lib64"
 CONF_MULTILIBDIR="lib32"
 
+# If FEATURES="multilib-strict" on newer portages (see bug #75420), emerge
+# will die if we try installing 64bit libs into a lib dir.  This should
+# help us squash bugs for future correct multilib support.
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit"

diff --git a/profiles/default-linux/amd64/multilib-dev/lib/make.defaults b/profiles/default-linux/amd64/multilib-dev/lib/make.defaults
index 56e9891791e3f2ef8147595645939d9e7631d1aa..3ccd5513bfef01ea7f7338db6918715b7dd086ee 100644 (file)
--- a/profiles/default-linux/amd64/multilib-dev/lib/make.defaults
+++ b/profiles/default-linux/amd64/multilib-dev/lib/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/multilib-dev/lib/make.defaults,v 1.1 2005/01/01 00:42:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/lib/make.defaults,v 1.2 2005/01/05 08:04:56 eradicator Exp $
 
 # This isn't fully implemented in portage/toolchain, yet. See 
 # http://bugs.gentoo.org/show_bug.cgi?id=75420
@@ -19,3 +19,6 @@ LIBDIR_amd64="lib64"
 ARCH_WRAPPER_x86="linux32"
 CFLAGS_x86="-m32"
 LIBDIR_x86="lib32"
+
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit"

diff --git a/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults b/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults
index 1d45d8e8ea5a5f007a55f7fcfde2de953f15853a..d9604087c776472332f7ca3c6dafbcf6a36bd721 100644 (file)
--- a/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults
+++ b/profiles/default-linux/amd64/multilib-dev/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/multilib-dev/lib64/make.defaults,v 1.1 2005/01/01 00:42:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults,v 1.2 2005/01/05 08:04:56 eradicator Exp $
 
 # This isn't fully implemented in portage/toolchain, yet. See 
 # http://bugs.gentoo.org/show_bug.cgi?id=75420
@@ -19,3 +19,7 @@ LIBDIR_amd64="lib64"
 ARCH_WRAPPER_x86="linux32"
 CFLAGS_x86="-m32"
 LIBDIR_x86="lib"
+
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit"
+

diff --git a/profiles/default-linux/amd64/multilib-dev/make.defaults b/profiles/default-linux/amd64/multilib-dev/make.defaults
index e2f74a9124a6aa88e3b2771857edf50355fd6a55..8019abae5fe64383b3128b8d8716f0dcb6891f2e 100644 (file)
--- a/profiles/default-linux/amd64/multilib-dev/make.defaults
+++ b/profiles/default-linux/amd64/multilib-dev/make.defaults
@@ -1,10 +1,12 @@
 # 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/multilib-dev/make.defaults,v 1.1 2005/01/01 00:42:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/make.defaults,v 1.2 2005/01/05 08:04:56 eradicator Exp $
 
 STAGE1_USE="multilib"
 GRP_STAGE23_USE="${STAGE1_USE} multislot ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java -nptl"
 USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 # we can enable sandbox now that we use multilib by default
-FEATURES="sandbox autoconfig"
+# also enable multilib-strict to force people using the dev profile to find
+# packages that don't honor libdir
+FEATURES="sandbox autoconfig multilib-strict"

diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
index 6e4122623e2b55600a469cdd7c67797a394b2dbc..ad9d32421c6585a5ac70e69c000282a465598e73 100644 (file)
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
@@ -1,8 +1,8 @@
 # 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.13 2005/01/02 11:10:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.14 2005/01/05 08:08:27 eradicator Exp $
 
-FEATURES="sandbox ccache autoconfig multilib-pkg"
+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"
@@ -10,7 +10,7 @@ GRP_STAGE23_USE="berkdb gpm ipv6 -java multislot multilib ncurses nls -nptl pam
 # Sane, minimal USE settings
 USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups fortran f77 fbcon gif jpeg nls png tiff truetype truetype-fonts type1-fontsusb xpm xrandr xv"
 
-# This isn't implemented in portage/toolchain, yet. See 
+# 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
@@ -29,3 +29,6 @@ ARCH_WRAPPER_sparc32="sparc32"
 ASFLAGS_sparc32="-32"
 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"