[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Mike Frysinger]

commit:     ce18a6065c124e7509d90b804fe9bc0f570d355b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 16:15:18 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 18:26:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce18a606

sys-libs/glibc: ignore locale settings in preinst test

When upgrading to a new version, the localedata format might have
changed, which means the test programs may crash inside of glibc
when trying to parse it.  Since this test is not for verifying
localedata (which we'll be rebuilding anyways), clear the active
locale settings.

 sys-libs/glibc/files/eblits/pkg_preinst.eblit | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index 9160aaf..cb8f461 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -29,6 +29,9 @@ glibc_sanity_check() {
 		*"statically linked"*) continue;;
 		*"ASCII text"*) continue;;
 		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
 		./ld-*.so --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
 	done

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Mike Frysinger]

commit:     dfe748c6971a880e6110ee40e484895f0b57e512
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 18:35:48 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 20:40:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe748c6

sys-libs/glibc: use new timezone-tools configure flag

 sys-libs/glibc/files/eblits/src_configure.eblit | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index 954508c..99964fb 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -119,6 +119,11 @@ glibc_do_configure() {
 		${EXTRA_ECONF}
 	)
 
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	if version_is_at_least 2.23 ; then
+		myconf+=( $(use_enable vanilla timezone-tools) )
+	fi
+
 	# 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)

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Mike Frysinger]

commit:     6f8a59c05ff00ddafbfbfffecdac6e71cf175fbd
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 06:41:29 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 08:16:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8a59c0

sys-libs/glibc: rework sparc target selection #323445 #361779

The current code assumes all targets are at least sparc v9.  This breaks
people trying to build for older/embedded targets like sparc v8.  Only use
specific targets when the user has set -mcpu.  This does mean we will be
using a lower target for some users (who don't have -mcpu set), but that's
more in line with what we want.  Similarly, do not assume that because we
are using a 64-bit kernel we always want a 64-bit userland or newer cpu.

We also drop filtering of -mvis flags (we haven't been filtering the newer
options like -mvis2 or -mvis3) as it doesn't seem to be an issue.

We also drop the filtering of -Wa,-xarch and -Wa,-A flags.  We want to let
the user select their own, or just rely on the -mcpu setting.  This might
mean for some users they get slightly slower builds if they haven't set an
explicit -mcpu flag, but that's also what we want.

 sys-libs/glibc/files/eblits/common.eblit | 126 ++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 53 deletions(-)

diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 51ba4a9..c0a989c 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -102,62 +102,82 @@ setup_target_flags() {
 			# 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}:${CTARGET} in
-					sparc64:*|\
-					default: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 the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparc64v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
 					;;
-					*)
-						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
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
 					;;
 				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
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparcv9v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
 		;;
 	esac
 }

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Benda XU]

commit:     a0b8f3652b5a1aa4dc766d9652fb72aeb15e0a32
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 08:07:09 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 08:08:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b8f365

sys-libs/glibc/files/eblits: Prefix support.

Bug: 473728

Package-Manager: portage-2.2.28

 sys-libs/glibc/files/eblits/common.eblit        |  2 +-
 sys-libs/glibc/files/eblits/pkg_postinst.eblit  |  8 ++++----
 sys-libs/glibc/files/eblits/pkg_preinst.eblit   |  4 ++--
 sys-libs/glibc/files/eblits/src_configure.eblit | 14 +++++++-------
 sys-libs/glibc/files/eblits/src_install.eblit   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index c0a989c..e56f10e 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -27,7 +27,7 @@ alt_headers() {
 }
 alt_build_headers() {
 	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS=$(alt_headers)
+		ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
 		if tc-is-cross-compiler ; then
 			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
 			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then

diff --git a/sys-libs/glibc/files/eblits/pkg_postinst.eblit b/sys-libs/glibc/files/eblits/pkg_postinst.eblit
index 074cf3a..8178fa1 100644
--- a/sys-libs/glibc/files/eblits/pkg_postinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_postinst.eblit
@@ -6,9 +6,9 @@ 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
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
-		"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
@@ -17,10 +17,10 @@ eblit-glibc-pkg_postinst() {
 		/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"
+		local locale_list="${EROOT}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"
+			locale_list="${EROOT}usr/share/i18n/SUPPORTED"
 		fi
 		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
 	fi

diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index cb8f461..0c78b55 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -11,7 +11,7 @@
 glibc_sanity_check() {
 	cd / #228809
 
-	# We enter ${D} so to avoid trouble if the path contains
+	# We enter ${ED} 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
@@ -53,7 +53,7 @@ eblit-glibc-pkg_preinst() {
 	fi
 
 	[[ ${ROOT} != "/" ]] && return 0
-	[[ -d ${D}/$(get_libdir) ]] || return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
 	glibc_sanity_check
 
 	# For newer EAPIs, this was run in pkg_pretend.

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index be6f52c..5ecf9ab 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -105,11 +105,11 @@ glibc_do_configure() {
 		$(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
+		--prefix="${EPREFIX}/usr"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
 		--with-bugurl=http://bugs.gentoo.org/
 		--with-pkgversion="$(glibc_banner)"
 		$(use_multiarch || echo --disable-multi-arch)
@@ -130,7 +130,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="${EPREFIX}/$(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
@@ -236,7 +236,7 @@ toolchain-glibc_headers_configure() {
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
 		--with-headers=$(alt_build_headers)
-		--prefix=/usr
+		--prefix="${EPREFIX}/usr"
 		${EXTRA_ECONF}
 	)
 

diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 4a80560..f0017fa 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -102,7 +102,7 @@ toolchain-glibc_src_install() {
 		has ${ldso_abi} $(get_install_abis) || continue
 
 		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
 			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
 		fi
 	done
@@ -111,7 +111,7 @@ toolchain-glibc_src_install() {
 	# binary to be setuid.  This is because the default owners/perms will be
 	# exactly what we want.
 	if in_iuse suid && ! use suid ; then
-		find "${D}" -name pt_chown -exec chmod -s {} +
+		find "${ED}" -name pt_chown -exec chmod -s {} +
 	fi
 
 	#################################################################

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Benda XU]

commit:     039850e0cd5448952d991196f615796cd59654e3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 13:26:05 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 13:26:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039850e0

sys-libs/glibc: add sysconfdir and localstatedir.

  In Prefix, ${prefix} != /usr, sysconfdir defaults
  to ${prefix}/etc and localstatedir to ${prefix}/var.
  which results in EPREFIX/usr/{etc,var}.

  This commit avoids that.

Package-Manager: portage-2.2.28

 sys-libs/glibc/files/eblits/src_configure.eblit | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index 5ecf9ab..5ba094a 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -106,6 +106,8 @@ glibc_do_configure() {
 		$(use_with gd)
 		--with-headers=$(alt_build_headers)
 		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
 		--libdir='$(prefix)'/$(get_libdir)
 		--mandir='$(prefix)'/share/man
 		--infodir='$(prefix)'/share/info

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Benda XU]

commit:     074751b72e6b44f264e1908e603205fa63cf6863
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 13:25:34 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 13:28:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=074751b7

sys-libs/glibc: glibc_headers_install should use $(alt_prefix).

  do not hardcode /usr/${CTARGET}.

 sys-libs/glibc/files/eblits/src_install.eblit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index f0017fa..a23173e 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -212,7 +212,7 @@ toolchain-glibc_headers_install() {
 	# Make sure we install the sys-include symlink so that when
 	# we build a 2nd stage cross-compiler, gcc finds the target
 	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include /usr/${CTARGET}/sys-include
+	dosym usr/include $(alt_prefix)/sys-include
 }
 
 src_strip() {

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Benda XU]

commit:     bf9204c03a17020dd840145b26fd1b5a5ee35127
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 22:46:27 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 23:19:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9204c0

sys-libs/glibc: specify sbin in src_configure.

  In configure when prefix=/usr, libc_cv_rootsbindir
  is set to /sbin instead of /usr/sbin.  The same does
  not apply if prefix=EPREFIX/usr.  We force it in Prefix
  to be consistant.

Package-Manager: portage-2.2.28

 sys-libs/glibc/files/eblits/src_configure.eblit | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index 5ba094a..396bce5 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -132,6 +132,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_rootsbindir="${EPREFIX}/sbin"
 	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
 
 	# We take care of patching our binutils to use both hash styles,

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Michał Górny]

commit:     ffc59b9e2bbe9ad89a1ab60e3a147785fe944141
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 22:03:15 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 11:05:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc59b9e

sys-libs/glibc: Do not reset multilib vars unless cross-compiling, #588368

Do not call multilib_env_reset unless cross-compiling, in order to
prevent the function from redefining profile-defined variables such as
LIBDIR_*.

 sys-libs/glibc/files/eblits/common.eblit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index e56f10e..370782b 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -318,8 +318,9 @@ setup_env() {
 	unset LD_RUN_PATH
 	unset LD_ASSUME_KERNEL
 
-	multilib_env ${CTARGET_OPT:-${CTARGET}}
 	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
 		if ! use multilib ; then
 			MULTILIB_ABIS=${DEFAULT_ABI}
 		else

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Mike Frysinger]

commit:     49c173976aa0cc4b8df93f3bd4985f27c9ca43b0
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 05:26:41 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 05:27:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c17397

sys-libs/glibc: permit downgrades between r# versions

The ABI should not be changed by Gentoo patchsets, so allow people to
move between -r# versions.

 sys-libs/glibc/files/eblits/pkg_pretend.eblit | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-libs/glibc/files/eblits/pkg_pretend.eblit b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
index ff8f1c1..47e2987 100644
--- a/sys-libs/glibc/files/eblits/pkg_pretend.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
@@ -78,13 +78,15 @@ eblit-glibc-pkg_pretend() {
 		check_devpts
 	fi
 
-	# prevent native builds from downgrading ... maybe update to allow people
-	# to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2)
+	# Prevent native builds from downgrading.
 	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
 	   [[ ${ROOT} == "/" ]] && \
 	   [[ ${CBUILD} == ${CHOST} ]] && \
 	   [[ ${CHOST} == ${CTARGET} ]] ; then
-		if has_version '>'${CATEGORY}/${PF} ; then
+		# The high rev # is to allow people to downgrade between -r# versions.
+		# We want to block 2.20->2.19, but 2.20-r3->2.20-r2 should be fine.
+		# Hopefully we never actually use a r# this high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; 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"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Mike Frysinger]

commit:     43e0e8838d4f259a2c9252da59649de4677f36f1
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Wed Dec  7 07:01:57 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 07:02:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e0e883

sys-libs/glibc: hack initial mips cross headers for 2.21+

The mips preconfigure script has changed (again), so update the hacks
for the early cross-compile glibc headers phase.

URL: https://crbug.com/647033

 sys-libs/glibc/files/eblits/src_configure.eblit | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index 396bce5..c1e6a2d 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -226,6 +226,14 @@ toolchain-glibc_headers_configure() {
 		pushd "${S}"/sysdeps/mips >/dev/null
 		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
 		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+		if version_is_at_least 2.21 ; then
+			# Force the mips ABI to the default.  This is OK because the set of
+			# installed headers in this phase is the same between the 3 ABIs.
+			# If this ever changes, this hack will break, but that's unlikely
+			# as glibc discourages that behavior.
+			# https://crbug.com/647033
+			sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+		fi
 		popd >/dev/null
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/

[Benda XU]

commit:     63c6df1a0ce38bb72792aef3ced98f3ccba8c684
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 13:47:49 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 13:49:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c6df1a

sys-libs/glibc: skip sanity check if BOOTSTRAP_RAP is set.

Bug: 473728

Package-Manager: portage-2.3.3

 sys-libs/glibc/files/eblits/pkg_preinst.eblit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index 0c78b55..a7975e2 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -54,7 +54,7 @@ eblit-glibc-pkg_preinst() {
 
 	[[ ${ROOT} != "/" ]] && return 0
 	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	glibc_sanity_check
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
 
 	# For newer EAPIs, this was run in pkg_pretend.
 	if [[ ${EAPI:-0} == [0123] ]] ; then