[patch] glibc.patch

glibc.patch (text/plain), 13.75 KB, created by Benda Xu on 2013-06-19 13:27:14 UTC

Index: glibc/files/eblits/common.eblit
===================================================================
--- glibc.orig/files/eblits/common.eblit
+++ glibc/files/eblits/common.eblit
@@ -2,10 +2,33 @@
 # 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
@@ -19,7 +42,7 @@ alt_build_headers() {
 		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
+			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
Index: glibc/files/eblits/pkg_preinst.eblit
===================================================================
--- glibc.orig/files/eblits/pkg_preinst.eblit
+++ glibc/files/eblits/pkg_preinst.eblit
@@ -15,12 +15,12 @@ glibc_sanity_check() {
 	# 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) >/dev/null
+	pushd "${ED}"/$(get_libdir) >/dev/null
 
 	local x striptest
 	for x in date env ls true uname ; do
 		x=$(type -p ${x})
-		[[ -z ${x} ]] && continue
+		[[ -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 \
@@ -34,12 +34,14 @@ eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
 	just_headers && return
 
+	eprefix_env
+
 	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${ROOT}"/etc/ld.so.conf.d
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
 
 	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${ROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${D}"/etc/host.conf
+	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
 
Index: glibc/files/eblits/pkg_setup.eblit
===================================================================
--- glibc.orig/files/eblits/pkg_setup.eblit
+++ glibc/files/eblits/pkg_setup.eblit
@@ -74,9 +74,9 @@ eblit-glibc-pkg_setup() {
 	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."
+	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
 
@@ -98,18 +98,18 @@ eblit-glibc-pkg_setup() {
 
 	# Make sure host system is up to date #394453
 	if has_version '<sys-libs/glibc-2.13' && \
-	   [[ -n $(scanelf -qys__guard -F'#s%F' "${ROOT}"/lib*/l*-*.so) ]]
+	   [[ -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' \
-				"${ROOT}"/*bin/ \
-				"${ROOT}"/lib* \
-				"${ROOT}"/usr/*bin/ \
-				"${ROOT}"/usr/lib* | \
+				"${EROOT}"/*bin/ \
+				"${EROOT}"/lib* \
+				"${EROOT}"/usr/*bin/ \
+				"${EROOT}"/usr/lib* | \
 				egrep -v \
-					-e "^${ROOT}/lib.*/(libc|ld)-2.*.so$" \
-					-e "^${ROOT}/sbin/(ldconfig|sln)$"
+					-e "^${EROOT}/lib.*/(libc|ld)-2.*.so$" \
+					-e "^${EROOT}/sbin/(ldconfig|sln)$"
 		)
 		[[ -z ${files} ]]
 		if ! eend $? ; then
Index: glibc/files/eblits/src_compile.eblit
===================================================================
--- glibc.orig/files/eblits/src_compile.eblit
+++ glibc/files/eblits/src_compile.eblit
@@ -74,12 +74,14 @@ glibc_do_configure() {
 		--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
+		--with-headers="${EPREFIX}$(alt_build_headers)"
+		--prefix="${TPREFIX}/usr"
+		--libdir="${TPREFIX}/usr/$(get_libdir)"
+		--mandir="${TPREFIX}/usr/share/man"
+		--infodir="${TPREFIX}/usr/share/info"
+		--libexecdir="${TPREFIX}/usr/$(get_libdir)/misc/glibc"
+		--sysconfdir="${TPREFIX}/etc"
+		--localstatedir="${TPREFIX}/var"
 		--with-bugurl=http://bugs.gentoo.org/
 		--with-pkgversion="$(glibc_banner)"
 		$(use_multiarch || echo --disable-multi-arch)
@@ -91,7 +93,7 @@ glibc_do_configure() {
 
 	# 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)
+	export libc_cv_slibdir="${TPREFIX}/$(get_libdir)"
 
 	# We take care of patching our binutils to use both hash styles,
 	# and many people like to force gnu hash style only, so disable
@@ -199,8 +201,8 @@ toolchain-glibc_headers_compile() {
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_build_headers)
-		--prefix=/usr
+		--with-headers="${EPREFIX}$(alt_build_headers)"
+		--prefix="${TPREFIX}/usr"
 		${EXTRA_ECONF}
 	)
 
Index: glibc/files/eblits/src_install.eblit
===================================================================
--- glibc.orig/files/eblits/src_install.eblit
+++ glibc/files/eblits/src_install.eblit
@@ -10,7 +10,7 @@ toolchain-glibc_src_install() {
 		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl
 	fi
 
-	local install_root="${D}$(alt_prefix)"
+	local install_root="${D}${EPREFIX%${TPREFIX}}/$(alt_prefix)"
 	if want_linuxthreads ; then
 		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
@@ -34,37 +34,37 @@ toolchain-glibc_src_install() {
 			else
 				src_lib=$(eval echo */${l})
 			fi
-			cp -a ${src_lib} "${D}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}"
+			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 ${D}$(alt_usrlibdir)/${l} ]] ; then
+			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" \
-					"${D}"$(alt_usrlibdir)/${l} > "${D}"$(alt_usrlibdir)/nptl/${l}
+					"${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} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
+			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} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
+				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 "${D}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp"
+		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 "${D}"/etc/ld.so.cache
+	rm -f "${ED}"/etc/ld.so.cache
 
 	# Everything past this point just needs to be done once ...
 	is_final_abi || return 0
@@ -92,7 +92,7 @@ toolchain-glibc_src_install() {
 		sparc32 /lib/ld-linux.so.2
 		sparc64 /lib64/ld-linux.so.2
 	)
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${D}/$(alt_prefix)/lib ]] ; then
+	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
@@ -122,9 +122,9 @@ toolchain-glibc_src_install() {
 		# 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 "${D}"$(alt_libdir)/..
+		cd "${ED}"$(alt_libdir)/..
 		[[ -e lib ]] || mkdir lib
-		cd "${D}"$(alt_usrlibdir)/..
+		cd "${ED}"$(alt_usrlibdir)/..
 		[[ -e lib ]] || mkdir lib
 
 		dosym usr/include $(alt_prefix)/sys-include
@@ -137,7 +137,7 @@ toolchain-glibc_src_install() {
 		-e "/^#/d" \
 		-e "/SUPPORTED-LOCALES=/d" \
 		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${D}"/usr/share/i18n/SUPPORTED \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
 		|| die "generating /usr/share/i18n/SUPPORTED failed"
 	cd "${WORKDIR}"/extra/locale
 	dosbin locale-gen || die
@@ -150,7 +150,7 @@ toolchain-glibc_src_install() {
 	local a
 	keepdir /usr/$(get_libdir)/locale
 	for a in $(get_install_abis) ; do
-		if [[ ! -e ${D}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
 			dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
 		fi
 	done
@@ -166,13 +166,13 @@ toolchain-glibc_src_install() {
 		doinitd "${WORKDIR}"/extra/etc/nscd || die
 
 		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):"
+			-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[@]}" "${D}"/etc/init.d/nscd
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
 	else
 		# Do this since extra/etc/*.conf above might have nscd.conf.
-		rm -f "${D}"/etc/nscd.conf
+		rm -f "${ED}"/etc/nscd.conf
 	fi
 
 	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
@@ -184,13 +184,13 @@ toolchain-glibc_src_install() {
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${D}"/etc/localtime
+	rm -f "${ED}"/etc/localtime
 }
 
 toolchain-glibc_headers_install() {
 	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
 	cd "${GBUILDDIR}"
-	emake install_root="${D}$(alt_prefix)" install-headers || die
+	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
@@ -216,11 +216,13 @@ src_strip() {
 	# 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 "${D}"/*/libpthread-*.so
+		${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
Index: glibc/files/eblits/src_unpack.eblit
===================================================================
--- glibc.orig/files/eblits/src_unpack.eblit
+++ glibc/files/eblits/src_unpack.eblit
@@ -17,7 +17,7 @@ eend_KV() {
 
 get_kheader_version() {
 	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "$(alt_build_headers)" | \
+	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" | \
 	tail -n 1
 }
 
Index: glibc/glibc-2.17.ebuild
===================================================================
--- glibc.orig/glibc-2.17.ebuild
+++ glibc/glibc-2.17.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glib
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"