Attachment #351388 for bug #473728




# 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.29 2012/12/28 19:00:51 vapier Exp $

# There are many directory offsets here that can lead to confusion. We summarize the senarios in this table
# P:=Prefix X:=Cross-Triplet
# example of configure host: --with-headers
# example of configure target: --libdir
#
# variation   phase               PX                      X               P         solution
# -----------+-------------------+-----------------------+---------------+---------+----------------------------------------
# host        configure           EPREFIX/usr/CTARGET     /usr/CTARGET    EPREFIX   $EPREFIX/$(alt_prefix)
# target      configure           NULL                    NULL            EPREFIX   $TPREFIX
# -----------+-------------------+-----------------------+---------------+---------+----------------------------------------
# host        install_root        D/EPREFIX/usr/CTARGET   D/usr/CTARGET   D         ${D}/${EPREFIX%$TPREFIX}/$(alt_prefix)
# -----------+-------------------+-----------------------+---------------+---------+----------------------------------------
# host        ebuild helper ED/   /usr/CTARGET            /usr/CTARGET    NULL      $(alt_prefix)
#
# alt_prefix and TPREFIX in the table are defined as followed

alt_prefix() {
	is_crosscompile && echo /usr/${CTARGET}
}

TPREFIX=$(is_crosscompile || echo "${EPREFIX}")

eprefix_env() {
	ED="${D%/}${EPREFIX}/"
	EROOT="${ROOT%/}${EPREFIX}/"
}

# 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

		ALT_BUILD_HEADERS=$(alt_headers)
		if tc-is-cross-compiler ; then
			ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
			if [[ ! -e ${EPREFIX}/${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




	# lead to unsafe code execution if the generated prefix is
	# within a world-writable directory.
	# (e.g. /var/tmp/portage:${HOSTNAME})
	pushd "${ED}"/$(get_libdir) >/dev/null

	local x striptest
	for x in date env ls true uname ; do
		x=$(type -p ${x})
		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
		[[ ${striptest} == *"statically linked"* ]] && continue
		./ld-*.so --library-path . ${x} > /dev/null \

	# nothing to do if just installing headers
	just_headers && return

	eprefix_env

	# prepare /etc/ld.so.conf.d/ for files
	mkdir -p "${EROOT}"/etc/ld.so.conf.d

	# Default /etc/hosts.conf:multi to on for systems with small dbs.
	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
		elog "Defaulting /etc/host.conf:multi to on"
	fi





	fi

	# users have had a chance to phase themselves, time to give em the boot
	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
		die "lazy upgrader detected"
	fi



	# Make sure host system is up to date #394453
	if has_version '<sys-libs/glibc-2.13' && \
	   [[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib*/l*-*.so) ]]
	then
		ebegin "Scanning system for __guard to see if you need to rebuild first ..."
		local files=$(
			scanelf -qys__guard -F'#s%F' \
				"${EROOT}"/*bin/ \
				"${EROOT}"/lib* \
				"${EROOT}"/usr/*bin/ \
				"${EROOT}"/usr/lib* | \
				egrep -v \
					-e "^${EROOT}/lib.*/(libc|ld)-2.*.so$" \
					-e "^${EROOT}/sbin/(ldconfig|sln)$"
		)
		[[ -z ${files} ]]
		if ! eend $? ; then

Lines 74-85 glibc_do_configure() { Link Here

(-)glibc/files/eblits/src_compile.eblit (-9 / +11 lines)
74	--host=${CTARGET_OPT:-${CTARGET}}	74	--host=${CTARGET_OPT:-${CTARGET}}
75	$(use_enable profile)	75	$(use_enable profile)
76	$(use_with gd)	76	$(use_with gd)
77	--with-headers=$(alt_build_headers)	77	--with-headers="${EPREFIX}$(alt_build_headers)"
78	--prefix=/usr	78	--prefix="${TPREFIX}/usr"
79	--libdir=/usr/$(get_libdir)	79	--libdir="${TPREFIX}/usr/$(get_libdir)"
80	--mandir=/usr/share/man	80	--mandir="${TPREFIX}/usr/share/man"
81	--infodir=/usr/share/info	81	--infodir="${TPREFIX}/usr/share/info"
82	--libexecdir=/usr/$(get_libdir)/misc/glibc	82	--libexecdir="${TPREFIX}/usr/$(get_libdir)/misc/glibc"
		83	--sysconfdir="${TPREFIX}/etc"
		84	--localstatedir="${TPREFIX}/var"
83	--with-bugurl=http://bugs.gentoo.org/	85	--with-bugurl=http://bugs.gentoo.org/
84	--with-pkgversion="$(glibc_banner)"	86	--with-pkgversion="$(glibc_banner)"
85	$(use_multiarch \|\| echo --disable-multi-arch)	87	$(use_multiarch \|\| echo --disable-multi-arch)
Lines 91-97 glibc_do_configure() { Link Here
91		93
92	# There is no configure option for this and we need to export it	94	# There is no configure option for this and we need to export it
93	# since the glibc build will re-run configure on itself	95	# since the glibc build will re-run configure on itself
94	export libc_cv_slibdir=/$(get_libdir)	96	export libc_cv_slibdir="${TPREFIX}/$(get_libdir)"
95		97
96	# We take care of patching our binutils to use both hash styles,	98	# We take care of patching our binutils to use both hash styles,
97	# and many people like to force gnu hash style only, so disable	99	# and many people like to force gnu hash style only, so disable
Lines 199-206 toolchain-glibc_headers_compile() { Link Here
199	--enable-bind-now	201	--enable-bind-now
200	--build=${CBUILD_OPT:-${CBUILD}}	202	--build=${CBUILD_OPT:-${CBUILD}}
201	--host=${CTARGET_OPT:-${CTARGET}}	203	--host=${CTARGET_OPT:-${CTARGET}}
202	--with-headers=$(alt_build_headers)	204	--with-headers="${EPREFIX}$(alt_build_headers)"
203	--prefix=/usr	205	--prefix="${TPREFIX}/usr"
204	${EXTRA_ECONF}	206	${EXTRA_ECONF}
205	)	207	)
206		208




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

	local install_root="${D}${EPREFIX%${TPREFIX}}/$(alt_prefix)"
	if want_linuxthreads ; then
		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
		einfo "Installing GLIBC ${ABI} with linuxthreads ..."

			else
				src_lib=$(eval echo */${l})
			fi
			cp -a ${src_lib} "${ED}"$(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 ${ED}$(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" \
					"${ED}"$(alt_usrlibdir)/${l} > "${ED}"$(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} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
			src_lib=${src_lib/%.a/_nonshared.a}
			if [[ -e ${src_lib} ]] ; then
				cp -a ${src_lib} "${ED}"$(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 "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp"
	fi

	# We'll take care of the cache ourselves
	rm -f "${ED}"/etc/ld.so.cache

	# Everything past this point just needs to be done once ...
	is_final_abi || return 0

		sparc32 /lib/ld-linux.so.2
		sparc64 /lib64/ld-linux.so.2
	)
	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
	fi
	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do

		# gcc likes to use relative paths to get to its multilibs like
		# /usr/lib/../lib64/.  So while we don't install any files into
		# /usr/lib/, we do need it to exist.
		cd "${ED}"$(alt_libdir)/..
		[[ -e lib ]] || mkdir lib
		cd "${ED}"$(alt_usrlibdir)/..
		[[ -e lib ]] || mkdir lib

		dosym usr/include $(alt_prefix)/sys-include

		-e "/^#/d" \
		-e "/SUPPORTED-LOCALES=/d" \
		-e "s: \\\\::g" -e "s:/: :g" \
		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
		|| die "generating /usr/share/i18n/SUPPORTED failed"
	cd "${WORKDIR}"/extra/locale
	dosbin locale-gen || die

	local a
	keepdir /usr/$(get_libdir)/locale
	for a in $(get_install_abis) ; do
		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
			dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
		fi
	done

		doinitd "${WORKDIR}"/extra/etc/nscd || die

		local nscd_args=(
			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
		)
		version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' )
		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
	else
		# Do this since extra/etc/*.conf above might have nscd.conf.
		rm -f "${ED}"/etc/nscd.conf
	fi

	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc


	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
	# creation of the "factory" symlink in pkg_postinst().
	rm -f "${ED}"/etc/localtime
}

toolchain-glibc_headers_install() {
	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
	cd "${GBUILDDIR}"
	emake install_root="${D}${EPREFIX%${TPREFIX}}/$(alt_prefix)" install-headers || die
	if ! version_is_at_least 2.16 ; then
		insinto $(alt_headers)/bits
		doins bits/stdio_lim.h || die

	# if user has stripping enabled and does not have split debug turned on,
	# then leave the debugging sections in libpthread.
	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
	fi
}

eblit-glibc-src_install() {
	eprefix_env

	if just_headers ; then
		export ABI=default
		toolchain-glibc_headers_install

Lines 17-23 eend_KV() { Link Here

(-)glibc/files/eblits/src_unpack.eblit (-1 / +1 lines)
17		17
18	get_kheader_version() {	18	get_kheader_version() {
19	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' \| \	19	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' \| \
20	$(tc-getCPP ${CTARGET}) -I "$(alt_build_headers)" \| \	20	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" \| \
21	tail -n 1	21	tail -n 1
22	}	22	}
23		23

Lines 8-14 DESCRIPTION="GNU libc6 (also called glib Link Here

(-)glibc/glibc-2.17.ebuild (-1 / +1 lines)
8	HOMEPAGE="http://www.gnu.org/software/libc/libc.html"	8	HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
9		9
10	LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"	10	LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
11	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"	11	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
12	RESTRICT="strip" # strip ourself #46186	12	RESTRICT="strip" # strip ourself #46186
13	EMULTILIB_PKG="true"	13	EMULTILIB_PKG="true"
14		14

Return to bug 473728

Lines 2-11 Link Here

(-)glibc/files/eblits/common.eblit (-1 / +24 lines)
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.29 2012/12/28 19:00:51 vapier Exp $	3	# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.29 2012/12/28 19:00:51 vapier Exp $
4		4
		5	# There are many directory offsets here that can lead to confusion. We summarize the senarios in this table
		6	# P:=Prefix X:=Cross-Triplet
		7	# example of configure host: --with-headers
		8	# example of configure target: --libdir
		9	#
		10	# variation phase PX X P solution
		11	# -----------+-------------------+-----------------------+---------------+---------+----------------------------------------
		12	# host configure EPREFIX/usr/CTARGET /usr/CTARGET EPREFIX $EPREFIX/$(alt_prefix)
		13	# target configure NULL NULL EPREFIX $TPREFIX
		14	# -----------+-------------------+-----------------------+---------------+---------+----------------------------------------
		15	# host install_root D/EPREFIX/usr/CTARGET D/usr/CTARGET D ${D}/${EPREFIX%$TPREFIX}/$(alt_prefix)
		16	# -----------+-------------------+-----------------------+---------------+---------+----------------------------------------
		17	# host ebuild helper ED/ /usr/CTARGET /usr/CTARGET NULL $(alt_prefix)
		18	#
		19	# alt_prefix and TPREFIX in the table are defined as followed
		20
5	alt_prefix() {	21	alt_prefix() {
6	is_crosscompile && echo /usr/${CTARGET}	22	is_crosscompile && echo /usr/${CTARGET}
7	}	23	}
8		24
		25	TPREFIX=$(is_crosscompile \|\| echo "${EPREFIX}")
		26
		27	eprefix_env() {
		28	ED="${D%/}${EPREFIX}/"
		29	EROOT="${ROOT%/}${EPREFIX}/"
		30	}
		31
9	# We need to be able to set alternative headers for	32	# We need to be able to set alternative headers for
10	# compiling for non-native platform	33	# compiling for non-native platform
11	# Will also become useful for testing kernel-headers without screwing up	34	# Will also become useful for testing kernel-headers without screwing up
Lines 19-25 alt_build_headers() { Link Here
19	ALT_BUILD_HEADERS=$(alt_headers)	42	ALT_BUILD_HEADERS=$(alt_headers)
20	if tc-is-cross-compiler ; then	43	if tc-is-cross-compiler ; then
21	ALT_BUILD_HEADERS=${ROOT}$(alt_headers)	44	ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
22	if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then	45	if [[ ! -e ${EPREFIX}/${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
23	local header_path=$(echo '#include <linux/version.h>' \| $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \| grep -o '[^"]*linux/version.h')	46	local header_path=$(echo '#include <linux/version.h>' \| $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \| grep -o '[^"]*linux/version.h')
24	ALT_BUILD_HEADERS=${header_path%/linux/version.h}	47	ALT_BUILD_HEADERS=${header_path%/linux/version.h}
25	fi	48	fi

Lines 15-26 glibc_sanity_check() { Link Here

(-)glibc/files/eblits/pkg_preinst.eblit (-5 / +7 lines)
15	# lead to unsafe code execution if the generated prefix is	15	# lead to unsafe code execution if the generated prefix is
16	# within a world-writable directory.	16	# within a world-writable directory.
17	# (e.g. /var/tmp/portage:${HOSTNAME})	17	# (e.g. /var/tmp/portage:${HOSTNAME})
18	pushd "${D}"/$(get_libdir) >/dev/null	18	pushd "${ED}"/$(get_libdir) >/dev/null
19		19
20	local x striptest	20	local x striptest
21	for x in date env ls true uname ; do	21	for x in date env ls true uname ; do
22	x=$(type -p ${x})	22	x=$(type -p ${x})
23	[[ -z ${x} ]] && continue	23	[[ -z ${x} \|\| ${x} != ${EPREFIX}/* ]] && continue
24	striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) \|\| continue	24	striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) \|\| continue
25	[[ ${striptest} == "statically linked" ]] && continue	25	[[ ${striptest} == "statically linked" ]] && continue
26	./ld-*.so --library-path . ${x} > /dev/null \	26	./ld-*.so --library-path . ${x} > /dev/null \
Lines 34-45 eblit-glibc-pkg_preinst() { Link Here
34	# nothing to do if just installing headers	34	# nothing to do if just installing headers
35	just_headers && return	35	just_headers && return
36		36
		37	eprefix_env
		38
37	# prepare /etc/ld.so.conf.d/ for files	39	# prepare /etc/ld.so.conf.d/ for files
38	mkdir -p "${ROOT}"/etc/ld.so.conf.d	40	mkdir -p "${EROOT}"/etc/ld.so.conf.d
39		41
40	# Default /etc/hosts.conf:multi to on for systems with small dbs.	42	# Default /etc/hosts.conf:multi to on for systems with small dbs.
41	if [[ $(wc -l < "${ROOT}"/etc/hosts) -lt 1000 ]] ; then	43	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
42	sed -i '/^multi off/s:off:on:' "${D}"/etc/host.conf	44	sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
43	elog "Defaulting /etc/host.conf:multi to on"	45	elog "Defaulting /etc/host.conf:multi to on"
44	fi	46	fi
45		47

Lines 74-82 eblit-glibc-pkg_setup() { Link Here

(-)glibc/files/eblits/pkg_setup.eblit (-10 / +10 lines)
74	fi	74	fi
75		75
76	# users have had a chance to phase themselves, time to give em the boot	76	# users have had a chance to phase themselves, time to give em the boot
77	if [[ -e ${ROOT}/etc/locale.gen ]] && [[ -e ${ROOT}/etc/locales.build ]] ; then	77	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
78	eerror "You still haven't deleted ${ROOT}/etc/locales.build."	78	eerror "You still haven't deleted ${EROOT}/etc/locales.build."
79	eerror "Do so now after making sure ${ROOT}/etc/locale.gen is kosher."	79	eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
80	die "lazy upgrader detected"	80	die "lazy upgrader detected"
81	fi	81	fi
82		82
Lines 98-115 eblit-glibc-pkg_setup() { Link Here
98		98
99	# Make sure host system is up to date #394453	99	# Make sure host system is up to date #394453
100	if has_version '<sys-libs/glibc-2.13' && \	100	if has_version '<sys-libs/glibc-2.13' && \
101	[[ -n $(scanelf -qys__guard -F'#s%F' "${ROOT}"/lib/l-*.so) ]]	101	[[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib/l-*.so) ]]
102	then	102	then
103	ebegin "Scanning system for __guard to see if you need to rebuild first ..."	103	ebegin "Scanning system for __guard to see if you need to rebuild first ..."
104	local files=$(	104	local files=$(
105	scanelf -qys__guard -F'#s%F' \	105	scanelf -qys__guard -F'#s%F' \
106	"${ROOT}"/*bin/ \	106	"${EROOT}"/*bin/ \
107	"${ROOT}"/lib* \	107	"${EROOT}"/lib* \
108	"${ROOT}"/usr/*bin/ \	108	"${EROOT}"/usr/*bin/ \
109	"${ROOT}"/usr/lib* \| \	109	"${EROOT}"/usr/lib* \| \
110	egrep -v \	110	egrep -v \
111	-e "^${ROOT}/lib./(libc\|ld)-2..so$" \	111	-e "^${EROOT}/lib./(libc\|ld)-2..so$" \
112	-e "^${ROOT}/sbin/(ldconfig\|sln)$"	112	-e "^${EROOT}/sbin/(ldconfig\|sln)$"
113	)	113	)
114	[[ -z ${files} ]]	114	[[ -z ${files} ]]
115	if ! eend $? ; then	115	if ! eend $? ; then

Lines 10-16 toolchain-glibc_src_install() { Link Here

(-)glibc/files/eblits/src_install.eblit (-19 / +21 lines)
10	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl	10	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl
11	fi	11	fi
12		12
13	local install_root="${D}$(alt_prefix)"	13	local install_root="${D}${EPREFIX%${TPREFIX}}/$(alt_prefix)"
14	if want_linuxthreads ; then	14	if want_linuxthreads ; then
15	cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads	15	cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
16	einfo "Installing GLIBC ${ABI} with linuxthreads ..."	16	einfo "Installing GLIBC ${ABI} with linuxthreads ..."
Lines 34-70 toolchain-glibc_src_install() { Link Here
34	else	34	else
35	src_lib=$(eval echo */${l})	35	src_lib=$(eval echo */${l})
36	fi	36	fi
37	cp -a ${src_lib} "${D}"$(alt_libdir)/tls/${l} \|\| die "copying nptl ${l}"	37	cp -a ${src_lib} "${ED}"$(alt_libdir)/tls/${l} \|\| die "copying nptl ${l}"
38	fperms a+rx $(alt_libdir)/tls/${l}	38	fperms a+rx $(alt_libdir)/tls/${l}
39	dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib})	39	dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib})
40		40
41	# then grab the linker script or the symlink ...	41	# then grab the linker script or the symlink ...
42	if [[ -L ${D}$(alt_usrlibdir)/${l} ]] ; then	42	if [[ -L ${ED}$(alt_usrlibdir)/${l} ]] ; then
43	dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l}	43	dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l}
44	else	44	else
45	sed \	45	sed \
46	-e "s:/${l}:/tls/${l}:g" \	46	-e "s:/${l}:/tls/${l}:g" \
47	-e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \	47	-e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \
48	"${D}"$(alt_usrlibdir)/${l} > "${D}"$(alt_usrlibdir)/nptl/${l}	48	"${ED}"$(alt_usrlibdir)/${l} > "${ED}"$(alt_usrlibdir)/nptl/${l}
49	fi	49	fi
50		50
51	# then grab the static lib ...	51	# then grab the static lib ...
52	src_lib=${src_lib/%.so/.a}	52	src_lib=${src_lib/%.so/.a}
53	[[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a}	53	[[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a}
54	cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ \|\| die "copying nptl ${src_lib}"	54	cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ \|\| die "copying nptl ${src_lib}"
55	src_lib=${src_lib/%.a/_nonshared.a}	55	src_lib=${src_lib/%.a/_nonshared.a}
56	if [[ -e ${src_lib} ]] ; then	56	if [[ -e ${src_lib} ]] ; then
57	cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ \|\| die "copying nptl ${src_lib}"	57	cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ \|\| die "copying nptl ${src_lib}"
58	fi	58	fi
59	done	59	done
60		60
61	# use the nptl linker instead of the linuxthreads one as the linuxthreads	61	# use the nptl linker instead of the linuxthreads one as the linuxthreads
62	# one may lack TLS support and that can be really bad for business	62	# one may lack TLS support and that can be really bad for business
63	cp -a elf/ld.so "${D}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) \|\| die "copying nptl interp"	63	cp -a elf/ld.so "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) \|\| die "copying nptl interp"
64	fi	64	fi
65		65
66	# We'll take care of the cache ourselves	66	# We'll take care of the cache ourselves
67	rm -f "${D}"/etc/ld.so.cache	67	rm -f "${ED}"/etc/ld.so.cache
68		68
69	# Everything past this point just needs to be done once ...	69	# Everything past this point just needs to be done once ...
70	is_final_abi \|\| return 0	70	is_final_abi \|\| return 0
Lines 92-98 toolchain-glibc_src_install() { Link Here
92	sparc32 /lib/ld-linux.so.2	92	sparc32 /lib/ld-linux.so.2
93	sparc64 /lib64/ld-linux.so.2	93	sparc64 /lib64/ld-linux.so.2
94	)	94	)
95	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${D}/$(alt_prefix)/lib ]] ; then	95	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
96	dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib	96	dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
97	fi	97	fi
98	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do	98	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
Lines 122-130 toolchain-glibc_src_install() { Link Here
122	# gcc likes to use relative paths to get to its multilibs like	122	# gcc likes to use relative paths to get to its multilibs like
123	# /usr/lib/../lib64/. So while we don't install any files into	123	# /usr/lib/../lib64/. So while we don't install any files into
124	# /usr/lib/, we do need it to exist.	124	# /usr/lib/, we do need it to exist.
125	cd "${D}"$(alt_libdir)/..	125	cd "${ED}"$(alt_libdir)/..
126	[[ -e lib ]] \|\| mkdir lib	126	[[ -e lib ]] \|\| mkdir lib
127	cd "${D}"$(alt_usrlibdir)/..	127	cd "${ED}"$(alt_usrlibdir)/..
128	[[ -e lib ]] \|\| mkdir lib	128	[[ -e lib ]] \|\| mkdir lib
129		129
130	dosym usr/include $(alt_prefix)/sys-include	130	dosym usr/include $(alt_prefix)/sys-include
Lines 137-143 toolchain-glibc_src_install() { Link Here
137	-e "/^#/d" \	137	-e "/^#/d" \
138	-e "/SUPPORTED-LOCALES=/d" \	138	-e "/SUPPORTED-LOCALES=/d" \
139	-e "s: \\\\::g" -e "s:/: :g" \	139	-e "s: \\\\::g" -e "s:/: :g" \
140	"${S}"/localedata/SUPPORTED > "${D}"/usr/share/i18n/SUPPORTED \	140	"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
141	\|\| die "generating /usr/share/i18n/SUPPORTED failed"	141	\|\| die "generating /usr/share/i18n/SUPPORTED failed"
142	cd "${WORKDIR}"/extra/locale	142	cd "${WORKDIR}"/extra/locale
143	dosbin locale-gen \|\| die	143	dosbin locale-gen \|\| die
Lines 150-156 toolchain-glibc_src_install() { Link Here
150	local a	150	local a
151	keepdir /usr/$(get_libdir)/locale	151	keepdir /usr/$(get_libdir)/locale
152	for a in $(get_install_abis) ; do	152	for a in $(get_install_abis) ; do
153	if [[ ! -e ${D}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then	153	if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
154	dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale	154	dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
155	fi	155	fi
156	done	156	done
Lines 166-178 toolchain-glibc_src_install() { Link Here
166	doinitd "${WORKDIR}"/extra/etc/nscd \|\| die	166	doinitd "${WORKDIR}"/extra/etc/nscd \|\| die
167		167
168	local nscd_args=(	168	local nscd_args=(
169	-e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd \| grep nscd.pid):"	169	-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd \| grep nscd.pid):"
170	)	170	)
171	version_is_at_least 2.16 \|\| nscd_args+=( -e 's: --foreground : :' )	171	version_is_at_least 2.16 \|\| nscd_args+=( -e 's: --foreground : :' )
172	sed -i "${nscd_args[@]}" "${D}"/etc/init.d/nscd	172	sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
173	else	173	else
174	# Do this since extra/etc/*.conf above might have nscd.conf.	174	# Do this since extra/etc/*.conf above might have nscd.conf.
175	rm -f "${D}"/etc/nscd.conf	175	rm -f "${ED}"/etc/nscd.conf
176	fi	176	fi
177		177
178	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc	178	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
Lines 184-196 toolchain-glibc_src_install() { Link Here
184		184
185	# Prevent overwriting of the /etc/localtime symlink. We'll handle the	185	# Prevent overwriting of the /etc/localtime symlink. We'll handle the
186	# creation of the "factory" symlink in pkg_postinst().	186	# creation of the "factory" symlink in pkg_postinst().
187	rm -f "${D}"/etc/localtime	187	rm -f "${ED}"/etc/localtime
188	}	188	}
189		189
190	toolchain-glibc_headers_install() {	190	toolchain-glibc_headers_install() {
191	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers	191	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
192	cd "${GBUILDDIR}"	192	cd "${GBUILDDIR}"
193	emake install_root="${D}$(alt_prefix)" install-headers \|\| die	193	emake install_root="${D}${EPREFIX%${TPREFIX}}/$(alt_prefix)" install-headers \|\| die
194	if ! version_is_at_least 2.16 ; then	194	if ! version_is_at_least 2.16 ; then
195	insinto $(alt_headers)/bits	195	insinto $(alt_headers)/bits
196	doins bits/stdio_lim.h \|\| die	196	doins bits/stdio_lim.h \|\| die
Lines 216-226 src_strip() { Link Here
216	# if user has stripping enabled and does not have split debug turned on,	216	# if user has stripping enabled and does not have split debug turned on,
217	# then leave the debugging sections in libpthread.	217	# then leave the debugging sections in libpthread.
218	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then	218	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
219	${STRIP:-${CTARGET}-strip} --strip-debug "${D}"//libpthread-.so	219	${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"//libpthread-.so
220	fi	220	fi
221	}	221	}
222		222
223	eblit-glibc-src_install() {	223	eblit-glibc-src_install() {
		224	eprefix_env
		225
224	if just_headers ; then	226	if just_headers ; then
225	export ABI=default	227	export ABI=default
226	toolchain-glibc_headers_install	228	toolchain-glibc_headers_install