diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-21 04:38:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-21 04:38:27 +0000 |
| commit | 76941d943a67bab12b8c24196f65d38a351615d7 (patch) | |
| tree | 6a2eb6f7c36949d84b78b62f920e5488dcdb60b9 /profiles/features | |
| parent | Fixes bugs 274836, 302384, 323683, 325709, 347005, 347223, 353687 and 353750. (diff) | |
| download | gentoo-2-76941d943a67bab12b8c24196f65d38a351615d7.tar.gz gentoo-2-76941d943a67bab12b8c24196f65d38a351615d7.tar.bz2 gentoo-2-76941d943a67bab12b8c24196f65d38a351615d7.zip | |
move the lib symlink profile down a dir and have the defaults match the binutils/gcc defaults
Diffstat (limited to 'profiles/features')
| -rw-r--r-- | profiles/features/32bit-userland/parent | 2 | ||||
| -rw-r--r-- | profiles/features/multilib/lib32/make.defaults | 12 | ||||
| -rw-r--r-- | profiles/features/multilib/make.defaults | 13 |
3 files changed, 18 insertions, 9 deletions
diff --git a/profiles/features/32bit-userland/parent b/profiles/features/32bit-userland/parent index ef64da6e1d20..9b90fe9346dc 100644 --- a/profiles/features/32bit-userland/parent +++ b/profiles/features/32bit-userland/parent @@ -1 +1 @@ -../multilib +../multilib/lib32 diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults new file mode 100644 index 000000000000..b2bdec6d91b6 --- /dev/null +++ b/profiles/features/multilib/lib32/make.defaults @@ -0,0 +1,12 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/lib32/make.defaults,v 1.1 2011/03/21 04:38:27 vapier Exp $ + +# Let baselayout create the lib symlink. +SYMLINK_LIB="yes" + +# 32-bit LIBDIR +LIBDIR_ppc="lib32" +LIBDIR_x86="lib32" +LIBDIR_x86_fbsd="lib32" +LIBDIR_sparc32="lib32" diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults index 3c4998fafe32..857ede3e2f4e 100644 --- a/profiles/features/multilib/make.defaults +++ b/profiles/features/multilib/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.3 2009/03/12 14:30:34 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.4 2011/03/21 04:38:27 vapier Exp $ # This is so we build with multilib from the start STAGE1_USE="multilib nptl nptlonly unicode" @@ -10,9 +10,6 @@ MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/ MULTILIB_STRICT_DENY="64-bit.*shared object" MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage)" -# Let baselayout create the lib symlink. -SYMLINK_LIB="yes" - # 64-bit LIBDIR LIBDIR_amd64="lib64" LIBDIR_amd64_fbsd="lib64" @@ -20,7 +17,7 @@ LIBDIR_ppc64="lib64" LIBDIR_sparc64="lib64" # 32-bit LIBDIR -LIBDIR_ppc="lib32" -LIBDIR_x86="lib32" -LIBDIR_x86_fbsd="lib32" -LIBDIR_sparc32="lib32" +LIBDIR_ppc="lib" +LIBDIR_x86="lib" +LIBDIR_x86_fbsd="lib" +LIBDIR_sparc32="lib" |