diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-05 08:04:56 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-05 08:04:56 +0000 |
| commit | 1cd34b2122b96f830e61f1615be7cf6b7e978239 (patch) | |
| tree | c35cd26863c1173c69fcf18638877cda96dbbe34 /profiles | |
| parent | version bump and to x86 (Manifest recommit) (diff) | |
| download | gentoo-2-1cd34b2122b96f830e61f1615be7cf6b7e978239.tar.gz gentoo-2-1cd34b2122b96f830e61f1615be7cf6b7e978239.tar.bz2 gentoo-2-1cd34b2122b96f830e61f1615be7cf6b7e978239.zip | |
multilib-strict additions
Diffstat (limited to 'profiles')
3 files changed, 13 insertions, 4 deletions
diff --git a/profiles/default-linux/amd64/multilib-dev/lib/make.defaults b/profiles/default-linux/amd64/multilib-dev/lib/make.defaults index 56e9891791e3..3ccd5513bfef 100644 --- 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 1d45d8e8ea5a..d9604087c776 100644 --- 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 e2f74a9124a6..8019abae5fe6 100644 --- 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" |