From: Mike Frysinger <vapier@chromium.org>
Date: Wed, 7 Dec 2016 07:01:57 +0000 (-0500)
Subject: sys-libs/glibc: hack initial mips cross headers for 2.21+
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=43e0e8838d4f259a2c9252da59649de4677f36f1;p=gentoo.git

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

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index 396bce52ca29..c1e6a2d1719d 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