keks-overlay.git

@@ -1,21 +0,0 @@

-AUX 2.11/glibc-2.11-hardened-pie.patch 1492 RMD160 dacf988364e3eeeaa2bd588420a19db373347678 SHA1 f44b4389d031bc618c83a2f196c4e2afa647a68a SHA256 74277f76ace9cb6b408ef7c1d43a3604ae0d6c1af539055aeaeb542d2bfa2a46

-AUX 2.12/glibc-2.12-hardened-pie.patch 1542 RMD160 c42e6a8eef542506c440d58395a066129cd40dec SHA1 703b4c23a6701f41cd51b629eae362e129b60de3 SHA256 9d11da52900a4cfdaa9052476029cb1b4c8004dfaef3cf446f3b728035f75fbe

-AUX eblits/common.eblit 9020 RMD160 82cec0d8109f420d9d2369ff6d872c8146d60ad6 SHA1 fc2eab1c0ba49c9536a3b21821dcf1ae265ac651 SHA256 c5e218a6b138b26067293bafd1595453be9ecd4b2e5322da4796330c61368ffe

-AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810

-AUX eblits/pkg_preinst.eblit 3764 RMD160 f9a9d43e2d2d8df073be7e1b66655e651cb10740 SHA1 b987e2802201e0f44c357ffc7b92da4aa77cf377 SHA256 41baa253ea529156d628108247545235c4ec377b184e7824bd790eba1361299e

-AUX eblits/pkg_setup.eblit 2814 RMD160 8352c4b9cc460b7193e17be8bca227db5b6df5ba SHA1 8de7ea78e364521b55574b16036d57e7d35a596f SHA256 b803723f75571649e10e0707a6dbe8b459eabdc149ef155558792db736faa201

-AUX eblits/src_compile-2.11.2.eblit 5849 RMD160 8881ea4b50cf177d628eb70913425db8c71e681d SHA1 31d75b03578aed3aa740a88091e2c0a7fe33786c SHA256 b1b9d25fe90b860ebaa8d78b0f6865da034040b58b044b665f4e0385052bc6d5

-AUX eblits/src_compile.eblit 5790 RMD160 d059d6ac75b6d6d60101a1c8456e11ecd1da2676 SHA1 4417abec18bce3a8eb9798a8519d868bbf3ba489 SHA256 ce8894489fd5c21dc74cc28116b77cb6d331743bbf9ecf32f4f8e368f997a74c

-AUX eblits/src_install-2.11.2.eblit 8091 RMD160 aa409a8fe8cabfeeb71c89d655d345cda84a3946 SHA1 f5526f3eaa448a808cde739d7c5a75fe9bdab245 SHA256 93e1188835bdd1156b33b7b03af3822c46f6d1a1bc8338e98b8aa0f950cee868

-AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e

-AUX eblits/src_install.eblit 8017 RMD160 f0f94cf49346af96d619ebc658ddb4193a9e91a3 SHA1 f10c162a048c8ef145d269feae9b741790495513 SHA256 a624b2e926bd4233c908cec39911e6df7f78f01c6380d436c1f3d05481efec41

-AUX eblits/src_test-2.11.2.eblit 1169 RMD160 d7d1f430453e5278c2f3d4ee4815faff3a47a03a SHA1 9d48060c34ef901cbe6e8d7880ea923c8e1b7f28 SHA256 95b14845a80a74abc5b5c5146f2291524d7dd66f8e1bd9d12b42a3234a065010

-AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727

-AUX eblits/src_unpack.eblit 5219 RMD160 3c63f22995dd13cafce46d519b28c4ede1ee0281 SHA1 b52d277a37232cc6d09666a55a8ee4f5d5d892b4 SHA256 d70a28c4f6662786822cb2852ea86836c92ff2f8059270022431e1d02da3a9e1

-AUX glibc-sec1 2564 RMD160 84e731c7b9835c63fbf1616fa8a5d918890a0a71 SHA1 e7d3e07c2cf76001897ab2b67190561d5d0a11bb SHA256 c555ed9e42f8124be75f9cce9b647c3252a314ff9b1a28a227e49ea7f2de8fc9

-AUX glibc-sec2 7820 RMD160 838bf19b0f1611d53308422b84c3d67c4fb07478 SHA1 9dbbc4bdd99f1b599e9be90611fde6c2c134a00f SHA256 c4514239863e742bd369c92e3e427e53304349ee0dc10e3819370b46cf337817

-AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8

-AUX nsswitch.conf 503 RMD160 f375f92f6b41029c93382c39cef896261b140cfc SHA1 42f7f5cc3de75c69bf60d806ac8490106ea63326 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d

-DIST glibc-2.12.1-patches-4.tar.bz2 89636 RMD160 e746b43d314666be5ed6de9f83a96a618700d60e SHA1 3433058674151dbb714bf0826d77e13603b62e3d SHA256 1977abf5b8a432d0d00a7e35608aeb309ea451f6be1359b7c5d05e046274c74c

-DIST glibc-2.12.1.tar.bz2 15667516 RMD160 4a46745f4220f4253af0b882d0c2072499e17653 SHA1 ef5ca1e765719d3290bd24f94705f27534f3744b SHA256 759f115c52bc12c5bb453af559dcd456d32138250b7cc96e47804e3d0ec97407

-EBUILD glibc-2.12.1-r2.ebuild 8814 RMD160 09cf6d2f39d9dabd6c7f595640c8b6a9dc3cb471 SHA1 2621eb1171721bd4490b76a0b5370a233c15cf10 SHA256 aff7e3c004701de9ccaffb700ef602e6b4b721cd0562361cf6061c6e7aaa606f

@@ -1,40 +0,0 @@

-http://bugs.gentoo.org/292139

-

-2009-11-08  Magnus Granberg  <zorry@ume.nu>

-

-	* Makeconfig (+link): Set to +link-pie.

-	(+link-static): Change $(static-start-installed-name) to

-	S$(static-start-installed-name).

-	(+prector): Set to +prectorS.

-	(+postctor): Set to +postctorS.

-

---- libc/Makeconfig

-+++ libc/Makeconfig

-@@ -447,11 +447,12 @@

- 	     $(common-objpfx)libc% $(+postinit),$^) \

- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)

- endif

-++link = $(+link-pie)

- # Command for statically linking programs with the C library.

- ifndef +link-static

- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \

- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \

--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \

-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \

- 	      $(+preinit) $(+prector) \

- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \

- 						     $(start-installed-name))\

-@@ -549,11 +550,10 @@

- ifeq ($(elf),yes)

- +preinit = $(addprefix $(csu-objpfx),crti.o)

- +postinit = $(addprefix $(csu-objpfx),crtn.o)

--+prector = `$(CC) --print-file-name=crtbegin.o`

--+postctor = `$(CC) --print-file-name=crtend.o`

--# Variants of the two previous definitions for linking PIE programs.

- +prectorS = `$(CC) --print-file-name=crtbeginS.o`

- +postctorS = `$(CC) --print-file-name=crtendS.o`

-++prector = $(+prectorS)

-++postctor = $(+postctorS)

- +interp = $(addprefix $(elf-objpfx),interp.os)

- endif

- csu-objpfx = $(common-objpfx)csu/

@@ -1,39 +0,0 @@

-2010-08-11  Magnus Granberg  <zorry@ume.nu>

-

-	#332331

-	* Makeconfig (+link): Set to +link-pie.

-	(+link-static): Change $(static-start-installed-name) to

-	S$(static-start-installed-name).

-	(+prector): Set to +prectorS.

-	(+postctor): Set to +postctorS.

-

---- libc/Makeconfig

-+++ libc/Makeconfig

-@@ -447,11 +447,12 @@

- 	     $(common-objpfx)libc% $(+postinit),$^) \

- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)

- endif

-++link = $(+link-pie)

- # Command for statically linking programs with the C library.

- ifndef +link-static

- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \

- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \

--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \

-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \

- 	      $(+preinit) $(+prector) \

- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \

- 						     $(start-installed-name))\

-@@ -549,11 +550,10 @@

- ifeq ($(elf),yes)

- +preinit = $(addprefix $(csu-objpfx),crti.o)

- +postinit = $(addprefix $(csu-objpfx),crtn.o)

--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`

--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`

--# Variants of the two previous definitions for linking PIE programs.

- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`

- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`

-++prector = $(+prectorS)

-++postctor = $(+postctorS)

- +interp = $(addprefix $(elf-objpfx),interp.os)

- endif

- csu-objpfx = $(common-objpfx)csu/

@@ -1,298 +0,0 @@

-# Copyright 1999-2010 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.12 2010/09/30 06:29:21 vapier Exp $

-

-# We need to be able to set alternative headers for

-# compiling for non-native platform

-# Will also become useful for testing kernel-headers without screwing up

-# the whole system.

-# note: intentionally undocumented.

-alt_headers() {

-	if [[ -z ${ALT_HEADERS} ]] ; then

-		if is_crosscompile ; then

-			ALT_HEADERS="/usr/${CTARGET}/usr/include"

-		else

-			ALT_HEADERS="/usr/include"

-		fi

-	fi

-	echo "${ALT_HEADERS}"

-}

-alt_build_headers() {

-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then

-		ALT_BUILD_HEADERS=$(alt_headers)

-		if tc-is-cross-compiler ; then

-			ALT_BUILD_HEADERS=${ROOT}$(alt_headers)

-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then

-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')

-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}

-			fi

-		fi

-	fi

-	echo "${ALT_BUILD_HEADERS}"

-}

-

-alt_usrlibdir() {

-	if is_crosscompile ; then

-		echo /usr/${CTARGET}/usr/$(get_libdir)

-	else

-		echo /usr/$(get_libdir)

-	fi

-}

-

-setup_flags() {

-	# Make sure host make.conf doesn't pollute us

-	if is_crosscompile || tc-is-cross-compiler ; then

-		CHOST=${CTARGET} strip-unsupported-flags

-	fi

-

-	# Store our CFLAGS because it's changed depending on which CTARGET

-	# we are building when pulling glibc on a multilib profile

-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}

-	CFLAGS=${CFLAGS_BASE}

-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}

-	CXXFLAGS=${CXXFLAGS_BASE}

-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}

-	ASFLAGS=${ASFLAGS_BASE}

-

-	# Over-zealous CFLAGS can often cause problems.  What may work for one

-	# person may not work for another.  To avoid a large influx of bugs

-	# relating to failed builds, we strip most CFLAGS out to ensure as few

-	# problems as possible.

-	strip-flags

-	strip-unsupported-flags

-	filter-flags -m32 -m64 -mabi=*

-

-	unset CBUILD_OPT CTARGET_OPT

-	if has_multilib_profile ; then

-		CTARGET_OPT=$(get_abi_CTARGET)

-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)

-	fi

-

-	case $(tc-arch) in

-		x86)

-			# -march needed for #185404

-			local t=${CTARGET_OPT:-${CTARGET}}

-			t=${t%%-*}

-			if ! echo "" | $(tc-getCC) ${CFLAGS} -E -dD - | grep -qs __${t}__ ; then

-				filter-flags '-march=*'

-				export CFLAGS="-march=${t} ${CFLAGS}"

-			fi

-		;;

-		amd64)

-			# Punt this when amd64's 2004.3 is removed

-			CFLAGS_x86="-m32"

-

-			# -march needed for #185404

-			local t=${CTARGET_OPT:-${CTARGET}}

-			t=${t%%-*}

-			if ! echo "" | $(tc-getCC) ${CFLAGS} ${CFLAGS_x86} -m32 -E -dD - | grep -qs __${t}__ ; then

-				filter-flags '-march=*'

-				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"

-			fi

-		;;

-		ppc)

-			append-flags "-freorder-blocks"

-		;;

-		sparc)

-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.

-			filter-flags "-fcall-used-g7"

-			append-flags "-fcall-used-g6"

-			filter-flags "-mvis"

-

-			GLIBCMAJOR=$(get_version_component_range 1 ${PV})

-			GLIBCMINOR=$(get_version_component_range 2 ${PV})

-

-			# set CTARGET_OPT so glibc can use cpu-specific .S files for better performance

-			# - UltraSPARC T1 (niagara) support requires >= glibc 2.8

-			# - UltraSPARC T2 (niagara2) support requires >= glibc 2.7

-

-			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then

-				case ${ABI} in

-					sparc64)

-						filter-flags -Wa,-xarch -Wa,-A

-

-						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then

-							CTARGET_OPT="sparc64v2-unknown-linux-gnu"

-							append-flags "-Wa,-xarch=v9b"

-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"

-						elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then

-							CTARGET_OPT="sparc64v-unknown-linux-gnu"

-							append-flags "-Wa,-xarch=v9b"

-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"

-						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then

-							CTARGET_OPT="sparc64b-unknown-linux-gnu"

-							append-flags "-Wa,-xarch=v9b"

-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"

-						else

-							CTARGET_OPT="sparc64-unknown-linux-gnu"

-							append-flags "-Wa,-xarch=v9a"

-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"

-						fi

-					;;

-					*)

-						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then

-							CTARGET_OPT="sparcv9v2-unknown-linux-gnu"

-						elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then

-							CTARGET_OPT="sparcv9v-unknown-linux-gnu"

-						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then

-							CTARGET_OPT="sparcv9b-unknown-linux-gnu"

-						else

-							CTARGET_OPT="sparcv9-unknown-linux-gnu"

-						fi

-					;;

-				esac

-			else

-				if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then

-					CTARGET_OPT="sparcv9v2-unknown-linux-gnu"

-				elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then

-					CTARGET_OPT="sparcv9v-unknown-linux-gnu"

-				elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then

-					CTARGET_OPT="sparcv9b-unknown-linux-gnu"

-				elif { is_crosscompile && want_nptl; } || is-flagq "-mcpu=ultrasparc2" || is-flagq "-mcpu=ultrasparc"; then

-					CTARGET_OPT="sparcv9-unknown-linux-gnu"

-				fi

-			fi

-		;;

-	esac

-

-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then

-		CBUILD_OPT=${CTARGET_OPT}

-	fi

-

-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be

-	# conservative here.  -fno-strict-aliasing is to work around #155906

-	filter-flags -O?

-	append-flags -O2 -fno-strict-aliasing

-

-	# Cant build glibc itself with fortify code

-	append-cppflags -U_FORTIFY_SOURCE

-

-	# building glibc with SSP is fraught with difficulty, especially

-	# due to __stack_chk_fail_local which would mean significant changes

-	# to the glibc build process. See bug #94325 #293721

-	use hardened && gcc-specs-ssp && append-cflags $(test-flags-CC -fno-stack-protector)

-

-	if use hardened && gcc-specs-pie ; then

-		# Force PIC macro definition for all compilations since they're all

-		# either -fPIC or -fPIE with the default-PIE compiler.

-		append-cppflags -DPIC

-	else

-		# Don't build -fPIE without the default-PIE compiler and the

-		# hardened-pie patch

-		filter-flags -fPIE

-	fi

-}

-

-want_nptl() {

-	[[ -z ${LT_VER} ]] && return 0

-	want_tls || return 1

-	use nptl || return 1

-

-	# Only list the arches that cannot do NPTL

-	case $(tc-arch) in

-		m68k) return 1;;

-		sparc)

-			# >= v9 is needed for nptl.

-			[[ ${PROFILE_ARCH} == "sparc" ]] && return 1

-		;;

-	esac

-

-	return 0

-}

-

-want_linuxthreads() {

-	[[ -z ${LT_VER} ]] && return 1

-	! use nptlonly && return 0

-	want_nptl || return 0

-	return 1

-}

-

-want_tls() {

-	# Archs that can use TLS (Thread Local Storage)

-	case $(tc-arch) in

-		sparc)

-			# 2.3.6 should have tls support on sparc64

-			# when using newer binutils

-			case ${CTARGET/-*} in

-				sparc64*) return 1 ;;

-				*) return 0 ;;

-			esac

-		;;

-		x86)

-			# requires i486 or better #106556

-			[[ ${CTARGET} == i[4567]86* ]] && return 0

-			return 1

-		;;

-	esac

-

-	return 0

-}

-

-want__thread() {

-	want_tls || return 1

-

-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.

-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1

-

-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}

-

-	# only test gcc -- cant test linking yet

-	tc-has-tls -c ${CTARGET}

-	WANT__THREAD=$?

-

-	return ${WANT__THREAD}

-}

-

-use_multilib() {

-	case ${CTARGET} in

-		sparc*|mips64*|x86_64*|powerpc64*|s390x*)

-			has_multilib_profile || use multilib ;;

-		*)  false ;;

-	esac

-}

-

-use_multiarch() {

-	# Make sure binutils is new enough to support indirect functions #336792

-	local bver=$($(tc-getLD ${CTARGET}) -v | awk '{print $NF}') nver

-	case $(tc-arch ${CTARGET}) in

-		amd64|x86) nver="2.20" ;;

-		sparc)     nver="2.21" ;;

-		*)         return 1 ;;

-	esac

-	version_is_at_least ${nver} ${bver}

-}

-

-# Setup toolchain variables that would be defined in the profiles for these archs.

-setup_env() {

-	# silly users

-	unset LD_RUN_PATH

-

-	if is_crosscompile || tc-is-cross-compiler ; then

-		multilib_env ${CTARGET}

-		if ! use multilib ; then

-			MULTILIB_ABIS=${DEFAULT_ABI}

-		else

-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}

-		fi

-

-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,

-		# and fall back on CFLAGS.

-		local VAR=CFLAGS_${CTARGET//[-.]/_}

-		CFLAGS=${!VAR-${CFLAGS}}

-	fi

-

-	setup_flags

-

-	export ABI=${ABI:-${DEFAULT_ABI:-default}}

-

-	if is_crosscompile || tc-is-cross-compiler ; then

-		local VAR=CFLAGS_${ABI}

-		# We need to export CFLAGS with abi information in them because

-		# glibc's configure script checks CFLAGS for some targets (like mips)

-		export CFLAGS="${!VAR} ${CFLAGS}"

-	fi

-}

-

-just_headers() {

-	is_crosscompile && use crosscompile_opts_headers-only

-}

@@ -1,29 +0,0 @@

-# Copyright 1999-2009 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_postinst.eblit,v 1.1 2009/03/01 21:06:22 vapier Exp $

-

-eblit-glibc-pkg_postinst() {

-	# nothing to do if just installing headers

-	just_headers && return

-

-	if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then

-		# Generate fastloading iconv module configuration file.

-		"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"

-	fi

-

-	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then

-		# Reload init ... if in a chroot or a diff init package, ignore

-		# errors from this step #253697

-		/sbin/telinit U 2>/dev/null

-

-		# if the host locales.gen contains no entries, we'll install everything

-		local locale_list="${ROOT}etc/locale.gen"

-		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then

-			ewarn "Generating all locales; edit /etc/locale.gen to save time/space"

-			locale_list="${ROOT}usr/share/i18n/SUPPORTED"

-		fi

-		local x jobs

-		for x in ${MAKEOPTS} ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done

-		locale-gen -j ${jobs:-1} --config "${locale_list}"

-	fi

-}

@@ -1,90 +0,0 @@

-# Copyright 1999-2010 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.3 2010/10/08 15:33:13 flameeyes Exp $

-

-fix_lib64_symlinks() {

-	# the original Gentoo/AMD64 devs decided that since 64bit is the native

-	# bitdepth for AMD64, lib should be used for 64bit libraries. however,

-	# this ignores the FHS and breaks multilib horribly... especially

-	# since it wont even work without a lib64 symlink anyways. *rolls eyes*

-	# see bug 59710 for more information.

-	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)

-	if [ -L ${ROOT}/lib64 ] ; then

-		ewarn "removing /lib64 symlink and moving lib to lib64..."

-		ewarn "dont hit ctrl-c until this is done"

-		rm ${ROOT}/lib64

-		# now that lib64 is gone, nothing will run without calling ld.so

-		# directly. luckily the window of brokenness is almost non-existant

-		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64

-		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64

-		# all better :)

-		ldconfig

-		ln -s lib64 ${ROOT}/lib

-		einfo "done! :-)"

-		einfo "fixed broken lib64/lib symlink in ${ROOT}"

-	fi

-	if [ -L ${ROOT}/usr/lib64 ] ; then

-		rm ${ROOT}/usr/lib64

-		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64

-		ln -s lib64 ${ROOT}/usr/lib

-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"

-	fi

-	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then

-		rm ${ROOT}/usr/X11R6/lib64

-		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64

-		ln -s lib64 ${ROOT}/usr/X11R6/lib

-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"

-	fi

-}

-

-eblit-glibc-pkg_preinst() {

-	# nothing to do if just installing headers

-	just_headers && return

-

-	# PPC64+others may want to eventually be added to this logic if they

-	# decide to be multilib compatible and FHS compliant. note that this

-	# chunk of FHS compliance only applies to 64bit archs where 32bit

-	# compatibility is a major concern (not IA64, for example).

-

-	# amd64's 2005.0 is the first amd64 profile to not need this code.

-	# 2005.0 is setup properly, and this is executed as part of the

-	# 2004.3 -> 2005.0 upgrade script.

-	# It can be removed after 2004.3 has been purged from portage.

-	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks

-

-	# it appears that /lib/tls is sometimes not removed.  See bug

-	# 69258 for more info.

-	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && [[ ! -d ${D}/$(alt_libdir)/tls ]] ; then

-		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."

-		rm -r "${ROOT}"/$(alt_libdir)/tls || die

-	fi

-

-	# prepare /etc/ld.so.conf.d/ for files

-	mkdir -p "${ROOT}"/etc/ld.so.conf.d

-

-	# simple test to make sure our new glibc isnt completely broken.

-	# make sure we don't test with statically built binaries since

-	# they will fail.  also, skip if this glibc is a cross compiler.

-	[[ ${ROOT} != "/" ]] && return 0

-	[[ -d ${D}/$(get_libdir) ]] || return 0

-	cd / #228809

-	local x striptest

-	for x in date env ls true uname ; do

-		x=$(type -p ${x})

-		[[ -z ${x} ]] && continue

-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)

-		[[ -z ${striptest} ]] && continue

-		[[ ${striptest} == *"statically linked"* ]] && continue

-		# we enter ${D} so to avoid trouble if the path contains

-		# special characters; for instance if the path contains the

-		# colon character (:), then the linker will try to split it

-		# and look for the libraries in an unexpected place. This can

-		# lead to unsafe code execution if the generated prefix is

-		# within a world-writable directory

-		# (e.g. /var/tmp/portage:${HOSTNAME})

-		pushd "${D}"/$(get_libdir) 2>/dev/null

-		./ld-*.so --library-path . ${x} > /dev/null \

-			|| die "simple run test (${x}) failed"

-		popd 2>/dev/null

-	done

-}

@@ -1,67 +0,0 @@

-# Copyright 1999-2009 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.4 2009/08/21 05:46:04 vapier Exp $

-

-eblit-glibc-pkg_setup() {

-	# prevent native builds from downgrading ... maybe update to allow people

-	# to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2)

-	if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then

-		if has_version '>'${CATEGORY}/${PF} ; then

-			eerror "Sanity check to keep you from breaking your system:"

-			eerror " Downgrading glibc is not supported and a sure way to destruction"

-			die "aborting to save your system"

-		fi

-

-		# Check for broken kernels #262698

-		cd "${T}"

-		printf '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n' > kern-clo-test.c

-		emake kern-clo-test || die

-		if ! ./kern-clo-test ; then

-			eerror "Your patched vendor kernel is broken.  You need to get an"

-			eerror "update from whoever is providing the kernel to you."

-			eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227"

-			die "keeping your system alive, say thank you"

-		fi

-

-		# Check for broken kernels #279260

-		cd "${T}"

-		printf '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' > kern-enosys-test.c

-		emake kern-enosys-test || die

-		if ! ./kern-enosys-test ; then

-			eerror "Your old kernel is broken.  You need to update it to"

-			eerror "a newer version as syscall(<bignum>) will break."

-			eerror "http://bugs.gentoo.org/279260"

-			die "keeping your system alive, say thank you"

-		fi

-	fi

-

-	# users have had a chance to phase themselves, time to give em the boot

-	if [[ -e ${ROOT}/etc/locale.gen ]] && [[ -e ${ROOT}/etc/locales.build ]] ; then

-		eerror "You still haven't deleted ${ROOT}/etc/locales.build."

-		eerror "Do so now after making sure ${ROOT}/etc/locale.gen is kosher."

-		die "lazy upgrader detected"

-	fi

-

-	if [[ ${CTARGET} == i386-* ]] ; then

-		eerror "i386 CHOSTs are no longer supported."

-		eerror "Chances are you don't actually want/need i386."

-		eerror "Please read http://www.gentoo.org/doc/en/change-chost.xml"

-		die "please fix your CHOST"

-	fi

-

-	if [[ -n ${LT_VER} ]] ; then

-		if use nptlonly && ! use nptl ; then

-			eerror "If you want nptlonly, add nptl to your USE too ;p"

-			die "nptlonly without nptl"

-		fi

-	fi

-

-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then

-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."

-		ewarn "This will result in a 50% performance penalty when running with a 32bit"

-		ewarn "hypervisor, which is probably not what you want."

-	fi

-

-	use hardened && ! gcc-specs-pie && \

-		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"

-}

@@ -1,208 +0,0 @@

-# Copyright 1999-2007 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-2.11.2.eblit,v 1.1 2010/08/10 08:08:05 vapier Exp $

-

-glibc_do_configure() {

-	local myconf

-

-	# set addons

-	pushd "${S}" > /dev/null

-	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"

-	popd > /dev/null

-

-	use nls || myconf="${myconf} --disable-nls"

-	myconf="${myconf} $(use_enable hardened stackguard-randomization)"

-	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then

-		myconf="${myconf} --enable-old-ssp-compat"

-	else

-		myconf="${myconf} --disable-old-ssp-compat"

-	fi

-

-	use glibc-omitfp && myconf="${myconf} --enable-omitfp"

-

-	[[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf="${myconf} --without-fp"

-

-	if [[ $1 == "linuxthreads" ]] ; then

-		if want_tls ; then

-			myconf="${myconf} --with-tls"

-

-			if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then

-				myconf="${myconf} --without-__thread"

-			else

-				myconf="${myconf} --with-__thread"

-			fi

-		else

-			myconf="${myconf} --without-tls --without-__thread"

-		fi

-

-		myconf="${myconf} --disable-sanity-checks"

-		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"

-		myconf="${myconf} --enable-kernel=${LT_KER_VER}"

-	elif [[ $1 == "nptl" ]] ; then

-		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"

-		myconf="${myconf} --enable-kernel=${NPTL_KERN_VER}"

-	else

-		die "invalid pthread option"

-	fi

-

-	# Since SELinux support is only required for nscd, only enable it if:

-	# 1. USE selinux

-	# 2. only for the primary ABI on multilib systems

-	# 3. Not a crosscompile

-	if ! is_crosscompile && use selinux ; then

-		if use multilib || has_multilib_profile ; then

-			if is_final_abi ; then

-				myconf="${myconf} --with-selinux"

-			else

-				myconf="${myconf} --without-selinux"

-			fi

-		else

-			myconf="${myconf} --with-selinux"

-		fi

-	else

-		myconf="${myconf} --without-selinux"

-	fi

-

-	myconf="${myconf}

-		--without-cvs

-		--enable-bind-now

-		--build=${CBUILD_OPT:-${CBUILD}}

-		--host=${CTARGET_OPT:-${CTARGET}}

-		$(use_enable profile)

-		$(use_with gd)

-		--with-headers=$(alt_build_headers)

-		--prefix=/usr

-		--libdir=/usr/$(get_libdir)

-		--mandir=/usr/share/man

-		--infodir=/usr/share/info

-		--libexecdir=/usr/$(get_libdir)/misc/glibc

-		${EXTRA_ECONF}"

-

-	# There is no configure option for this and we need to export it

-	# since the glibc build will re-run configure on itself

-	export libc_cv_slibdir=/$(get_libdir)

-

-	has_version app-admin/eselect-compiler || export CC=$(tc-getCC ${CTARGET})

-

-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1

-	mkdir -p "${GBUILDDIR}"

-	cd "${GBUILDDIR}"

-	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"

-	"${S}"/configure ${myconf} || die "failed to configure glibc"

-

-	# since we'll be punting them for cross-compilers, and they can cause

-	# problems (ia64+static), we'll just skip building altogether

-	is_crosscompile && sed -i '1ibuild-programs = no' config.make

-}

-

-toolchain-glibc_src_compile() {

-	echo

-	local v

-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do

-		einfo " $(printf '%15s' ${v}:)   ${!v}"

-	done

-	echo

-

-	if want_linuxthreads ; then

-		glibc_do_configure linuxthreads

-		einfo "Building GLIBC with linuxthreads..."

-		make PARALLELMFLAGS="${MAKEOPTS}" || die "make for ${ABI} failed"

-	fi

-	if want_nptl ; then

-		# ... and then do the optional nptl build

-		unset LD_ASSUME_KERNEL

-		glibc_do_configure nptl

-		einfo "Building GLIBC with NPTL..."

-		make PARALLELMFLAGS="${MAKEOPTS}" || die "make for ${ABI} failed"

-	fi

-}

-

-toolchain-glibc_headers_compile() {

-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers

-	mkdir -p "${GBUILDDIR}"

-	cd "${GBUILDDIR}"

-

-	# if we don't have a compiler yet, we cant really test it now ...

-	# hopefully they don't affect header geneation, so let's hope for

-	# the best here ...

-	export \

-		libc_cv_386_tls=yes \

-		libc_cv_asm_cfi_directives=yes \

-		libc_cv_broken_visibility_attribute=no \

-		libc_cv_gcc___thread=yes \

-		libc_cv_mlong_double_128=yes \

-		libc_cv_mlong_double_128ibm=yes \

-		libc_cv_ppc_machine=yes \

-		libc_cv_visibility_attribute=yes \

-		libc_cv_z_combreloc=yes \

-		libc_cv_z_execstack=yes \

-		libc_cv_z_initfirst=yes \

-		libc_cv_z_nodelete=yes \

-		libc_cv_z_nodlopen=yes \

-		libc_cv_z_relro=yes

-

-	# Pick out the correct location for build headers

-	local ports="" myconf="--disable-sanity-checks --enable-hacker-mode"

-	[[ -d ${S}/ports ]] && ports=",ports"

-	myconf="${myconf}

-		--enable-add-ons=nptl${ports}

-		--without-cvs

-		--enable-bind-now

-		--build=${CBUILD_OPT:-${CBUILD}}

-		--host=${CTARGET_OPT:-${CTARGET}}

-		--with-headers=$(alt_build_headers)

-		--prefix=/usr

-		${EXTRA_ECONF}"

-

-	# Nothing is compiled here which would affect the headers for the target.

-	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i

-	# dont care :p.

-	einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}"

-	CC=gcc \

-	CFLAGS="-O1 -pipe" \

-	"${S}"/configure ${myconf} || die "failed to configure glibc"

-}

-

-eblit-glibc-src_compile() {

-	if is_crosscompile ; then

-		export \

-			libc_cv_c_cleanup=yes \

-			libc_cv_forced_unwind=yes

-	fi

-

-	if just_headers ; then

-		toolchain-glibc_headers_compile

-		return

-	fi

-

-	setup_env

-

-	if [[ -z ${OABI} ]] ; then

-		local abilist=""

-		if has_multilib_profile ; then

-			abilist=$(get_install_abis)

-			einfo "Building multilib glibc for ABIs: ${abilist}"

-		elif is_crosscompile || tc-is-cross-compiler ; then

-			abilist=${DEFAULT_ABI}

-		fi

-		if [[ -n ${abilist} ]] ; then

-			OABI=${ABI}

-			for ABI in ${abilist} ; do

-				export ABI

-				src_compile

-			done

-			ABI=${OABI}

-			unset OABI

-			return 0

-		fi

-	fi

-

-	toolchain-glibc_src_compile

-}

@@ -1,210 +0,0 @@

-# Copyright 1999-2010 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.15 2010/09/30 06:29:21 vapier Exp $

-

-glibc_do_configure() {

-	local myconf

-

-	einfo "Configuring GLIBC for $1"

-

-	# set addons

-	pushd "${S}" > /dev/null

-	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"

-	popd > /dev/null

-

-	use nls || myconf="${myconf} --disable-nls"

-	myconf="${myconf} $(use_enable hardened stackguard-randomization)"

-	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then

-		myconf="${myconf} --enable-old-ssp-compat"

-	else

-		myconf="${myconf} --disable-old-ssp-compat"

-	fi

-

-	use glibc-omitfp && myconf="${myconf} --enable-omitfp"

-

-	[[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf="${myconf} --without-fp"

-

-	if [[ $1 == "linuxthreads" ]] ; then

-		if want_tls ; then

-			myconf="${myconf} --with-tls"

-

-			if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then

-				myconf="${myconf} --without-__thread"

-			else

-				myconf="${myconf} --with-__thread"

-			fi

-		else

-			myconf="${myconf} --without-tls --without-__thread"

-		fi

-

-		myconf="${myconf} --disable-sanity-checks"

-		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"

-		myconf="${myconf} --enable-kernel=${LT_KER_VER}"

-	elif [[ $1 == "nptl" ]] ; then

-		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"

-		myconf="${myconf} --enable-kernel=${NPTL_KERN_VER}"

-	else

-		die "invalid pthread option"

-	fi

-

-	# Since SELinux support is only required for nscd, only enable it if:

-	# 1. USE selinux

-	# 2. only for the primary ABI on multilib systems

-	# 3. Not a crosscompile

-	if ! is_crosscompile && use selinux ; then

-		if use multilib || has_multilib_profile ; then

-			if is_final_abi ; then

-				myconf="${myconf} --with-selinux"

-			else

-				myconf="${myconf} --without-selinux"

-			fi

-		else

-			myconf="${myconf} --with-selinux"

-		fi

-	else

-		myconf="${myconf} --without-selinux"

-	fi

-

-	myconf="${myconf}

-		--without-cvs

-		--enable-bind-now

-		--build=${CBUILD_OPT:-${CBUILD}}

-		--host=${CTARGET_OPT:-${CTARGET}}

-		$(use_enable profile)

-		$(use_with gd)

-		--with-headers=$(alt_build_headers)

-		--prefix=/usr

-		--libdir=/usr/$(get_libdir)

-		--mandir=/usr/share/man

-		--infodir=/usr/share/info

-		--libexecdir=/usr/$(get_libdir)/misc/glibc

-		$(use_multiarch || echo --disable-multi-arch)

-		${EXTRA_ECONF}"

-

-	# There is no configure option for this and we need to export it

-	# since the glibc build will re-run configure on itself

-	export libc_cv_slibdir=/$(get_libdir)

-

-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1

-	mkdir -p "${GBUILDDIR}"

-	cd "${GBUILDDIR}"

-	echo "${S}"/configure ${myconf}

-	"${S}"/configure ${myconf} || die "failed to configure glibc"

-

-	# since we'll be punting them for cross-compilers, and they can cause

-	# problems (ia64+static), we'll just skip building altogether

-	is_crosscompile && sed -i '1ibuild-programs = no' config.make

-}

-

-toolchain-glibc_src_compile() {

-	echo

-	local v

-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do

-		einfo " $(printf '%15s' ${v}:)   ${!v}"

-	done

-	export CC=$(tc-getCC ${CTARGET})

-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"

-	echo

-

-	if want_linuxthreads ; then

-		glibc_do_configure linuxthreads

-		emake || die "make for ${ABI} failed"

-	fi

-	if want_nptl ; then

-		# ... and then do the optional nptl build

-		unset LD_ASSUME_KERNEL

-		glibc_do_configure nptl

-		emake || die "make for ${ABI} failed"

-	fi

-}

-

-toolchain-glibc_headers_compile() {

-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers

-	mkdir -p "${GBUILDDIR}"

-	cd "${GBUILDDIR}"

-

-	# if we don't have a compiler yet, we cant really test it now ...

-	# hopefully they don't affect header geneation, so let's hope for

-	# the best here ...

-	export \

-		libc_cv_386_tls=yes \

-		libc_cv_asm_cfi_directives=yes \

-		libc_cv_broken_visibility_attribute=no \

-		libc_cv_gcc___thread=yes \

-		libc_cv_mlong_double_128=yes \

-		libc_cv_mlong_double_128ibm=yes \

-		libc_cv_ppc_machine=yes \

-		libc_cv_ppc_rel16=yes \

-		libc_cv_visibility_attribute=yes \

-		libc_cv_z_combreloc=yes \

-		libc_cv_z_execstack=yes \

-		libc_cv_z_initfirst=yes \

-		libc_cv_z_nodelete=yes \

-		libc_cv_z_nodlopen=yes \

-		libc_cv_z_relro=yes

-

-	# Pick out the correct location for build headers

-	local ports="" myconf="--disable-sanity-checks --enable-hacker-mode"

-	[[ -d ${S}/ports ]] && ports=",ports"

-	myconf="${myconf}

-		--enable-add-ons=nptl${ports}

-		--without-cvs

-		--enable-bind-now

-		--build=${CBUILD_OPT:-${CBUILD}}

-		--host=${CTARGET_OPT:-${CTARGET}}

-		--with-headers=$(alt_build_headers)

-		--prefix=/usr

-		${EXTRA_ECONF}"

-

-	# Nothing is compiled here which would affect the headers for the target.

-	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i

-	# dont care :p.

-	einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}"

-	CC=gcc \

-	CFLAGS="-O1 -pipe" \

-	"${S}"/configure ${myconf} || die "failed to configure glibc"

-}

-

-eblit-glibc-src_compile() {

-	if is_crosscompile ; then

-		export \

-			libc_cv_c_cleanup=yes \

-			libc_cv_forced_unwind=yes

-	fi

-

-	if just_headers ; then

-		toolchain-glibc_headers_compile

-		return

-	fi

-

-	setup_env

-

-	if [[ -z ${OABI} ]] ; then

-		local abilist=""

-		if has_multilib_profile ; then

-			abilist=$(get_install_abis)

-			einfo "Building multilib glibc for ABIs: ${abilist}"

-		elif is_crosscompile || tc-is-cross-compiler ; then

-			abilist=${DEFAULT_ABI}

-		fi

-		if [[ -n ${abilist} ]] ; then

-			OABI=${ABI}

-			for ABI in ${abilist} ; do

-				export ABI

-				src_compile

-			done

-			ABI=${OABI}

-			unset OABI

-			return 0

-		fi

-	fi

-

-	toolchain-glibc_src_compile

-}

@@ -1,252 +0,0 @@

-# Copyright 1999-2007 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-2.11.2.eblit,v 1.1 2010/08/10 08:08:05 vapier Exp $

-

-toolchain-glibc_src_install() {

-	local GBUILDDIR

-	if want_linuxthreads ; then

-		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads

-	else

-		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl

-	fi

-

-	local install_root=${D}

-	is_crosscompile && install_root="${install_root}/usr/${CTARGET}"

-	if want_linuxthreads ; then

-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads

-		einfo "Installing GLIBC ${ABI} with linuxthreads ..."

-	else # nptlonly

-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl

-		einfo "Installing GLIBC ${ABI} with NPTL ..."

-	fi

-	make PARALLELMFLAGS="${MAKEOPTS}" \

-		install_root="${install_root}" \

-		install || die

-

-	if is_crosscompile ; then

-		# punt all the junk not needed by a cross-compiler

-		cd "${D}"/usr/${CTARGET} || die

-		rm -rf ./{,usr/}{bin,etc,sbin,share} ./{,usr/}*/{gconv,misc}

-	fi

-

-	if want_linuxthreads && want_nptl ; then

-		einfo "Installing NPTL to $(alt_libdir)/tls/..."

-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl

-		dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl

-

-		local l src_lib

-		for l in libc libm librt libpthread libthread_db ; do

-			# take care of shared lib first ...

-			l=${l}.so

-			if [[ -e ${l} ]] ; then

-				src_lib=${l}

-			else

-				src_lib=$(eval echo */${l})

-			fi

-			cp -a ${src_lib} "${D}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}"

-			fperms a+rx $(alt_libdir)/tls/${l}

-			dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib})

-

-			# then grab the linker script or the symlink ...

-			if [[ -L ${D}$(alt_usrlibdir)/${l} ]] ; then

-				dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l}

-			else

-				sed \

-					-e "s:/${l}:/tls/${l}:g" \

-					-e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \

-					"${D}"$(alt_usrlibdir)/${l} > "${D}"$(alt_usrlibdir)/nptl/${l}

-			fi

-

-			# then grab the static lib ...

-			src_lib=${src_lib/%.so/.a}

-			[[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a}

-			cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"

-			src_lib=${src_lib/%.a/_nonshared.a}

-			if [[ -e ${src_lib} ]] ; then

-				cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"

-			fi

-		done

-

-		# use the nptl linker instead of the linuxthreads one as the linuxthreads

-		# one may lack TLS support and that can be really bad for business

-		cp -a elf/ld.so "${D}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp"

-	fi

-

-	# We'll take care of the cache ourselves

-	rm -f "${D}"/etc/ld.so.cache

-

-	# Some things want this, notably ash.

-	dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a

-

-	# Handle includes for different ABIs if glibc itself doesn't do it

-	# XXX: curr glibc should finally handle all of them correctly

-	#case $(tc-arch) in

-	#	amd64|mips|ppc|s390) ;;

-	#	*) prep_ml_includes $(alt_headers) ;;

-	#esac

-

-	# When cross-compiling for a non-multilib setup, make sure we have

-	# lib and a proper symlink setup

-	if is_crosscompile && ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then

-		cd "${D}"$(alt_libdir)/..

-		mv $(get_libdir) lib || die

-		ln -s lib $(get_libdir) || die

-		cd "${D}"$(alt_usrlibdir)/..

-		mv $(get_libdir) lib || die

-		ln -s lib $(get_libdir) || die

-	fi

-