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
 

Reply via email to