Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit
Date: Sat, 30 May 2015 05:29:32
Message-Id: 20150530052928.511F2A0C@oystercatcher.gentoo.org
1 vapier 15/05/30 05:29:28
2
3 Modified: src_configure.eblit
4 Log:
5 Hack around mips compiler settings when generating glibc headers #550192 by Andrew Aladjev.
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.7 sys-libs/glibc/files/eblits/src_configure.eblit
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.6&r2=1.7
15
16 Index: src_configure.eblit
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- src_configure.eblit 17 Mar 2015 00:06:40 -0000 1.6
23 +++ src_configure.eblit 30 May 2015 05:29:28 -0000 1.7
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.6 2015/03/17 00:06:40 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.7 2015/05/30 05:29:28 vapier Exp $
29
30 dump_toolchain_settings() {
31 echo
32 @@ -206,6 +206,14 @@
33 export ${v}
34 done
35
36 + # Blow away some random CC settings that screw things up. #550192
37 + if [[ -d ${S}/sysdeps/mips ]]; then
38 + pushd "${S}"/sysdeps/mips >/dev/null
39 + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
40 + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
41 + popd >/dev/null
42 + fi
43 +
44 local myconf=()
45 myconf+=(
46 --disable-sanity-checks