From bf90c6a869e3d8f0d97ddda3604d3206a25d68d9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 18 Mar 2011 20:25:03 +0000 Subject: Only generate /lib symlinks when SYMLINK_LIB is used. (Portage version: 2.2.0_alpha26/cvs/Linux x86_64) --- sys-libs/glibc/ChangeLog | 6 +++++- sys-libs/glibc/files/eblits/src_install.eblit | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index b7548bb3756a..d6470939160c 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.760 2011/03/18 20:24:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.761 2011/03/18 20:25:03 vapier Exp $ + + 18 Mar 2011; Mike Frysinger + files/eblits/src_install.eblit: + Only generate /lib symlinks when SYMLINK_LIB is used. 18 Mar 2011; Mike Frysinger files/eblits/common.eblit: Stick the ABI flags into CC so that they are used at all steps -- compiler, diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index 12c757778711..a134e5618f17 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.13 2011/03/11 02:40:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.14 2011/03/18 20:25:03 vapier Exp $ toolchain-glibc_src_install() { local GBUILDDIR @@ -98,7 +98,7 @@ toolchain-glibc_src_install() { is_final_abi || return 0 # Make sure the non-native interp can be found on multilib systems - if has_multilib_profile ; then + if [[ ${SYMLINK_LIB} == "yes" ]] && has_multilib_profile ; then case $(tc-arch) in amd64) [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR amd64) /lib -- cgit v1.2.3-65-gdbad