vapier 14/09/10 05:49:04 Modified: src_compile.eblit Log: Version bump. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.41 sys-libs/glibc/files/eblits/src_compile.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.41&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.41&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.40&r2=1.41 Index: src_compile.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- src_compile.eblit 21 Aug 2014 14:41:39 -0000 1.40 +++ src_compile.eblit 10 Sep 2014 05:49:03 -0000 1.41 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.40 2014/08/21 14:41:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.41 2014/09/10 05:49:03 vapier Exp $ glibc_do_configure() { local myconf=() @@ -9,14 +9,14 @@ # set addons pushd "${S}" > /dev/null - local ADDONS=$(echo */configure | sed \ + local addons=$(echo */configure | sed \ -e 's:/configure::g' \ -e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \ -e 's: \+$::' \ -e 's! !,!g' \ -e 's!^!,!' \ -e '/^,\*$/d') - [[ -d ports ]] && ADDONS="${ADDONS},ports" + [[ -d ports ]] && addons+=",ports" popd > /dev/null myconf+=( $(use_enable hardened stackguard-randomization) ) @@ -40,14 +40,16 @@ fi myconf+=( --disable-sanity-checks ) - myconf+=( --enable-add-ons="linuxthreads${ADDONS}" ) + addons="linuxthreads${addons}" myconf+=( --enable-kernel=${LT_KER_VER} ) elif [[ $1 == "nptl" ]] ; then - myconf+=( --enable-add-ons="nptl${ADDONS}" ) + # Newer versions require nptl, so there is no addon for it. + version_is_at_least 2.20 || addons="nptl${addons}" myconf+=( --enable-kernel=${NPTL_KERN_VER} ) else die "invalid pthread option" fi + myconf+=( --enable-add-ons="${addons#,}" ) # Since SELinux support is only required for nscd, only enable it if: # 1. USE selinux
