[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_unpack.eblit src_compile.eblit src_install.eblit

[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_unpack.eblit src_compile.eblit src_install.eblit

[Mike Frysinger (vapier)]

vapier      11/03/11 02:40:28

  Modified:             src_unpack.eblit src_compile.eblit
                        src_install.eblit
  Log:
  Get header-only install working for mips systems #235551 by Joshua Kinard.
  
  (Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 sys-libs/glibc/files/eblits/src_unpack.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?r1=1.11&r2=1.12

Index: src_unpack.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src_unpack.eblit	8 Jun 2010 04:59:56 -0000	1.11
+++ src_unpack.eblit	11 Mar 2011 02:40:28 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.11 2010/06/08 04:59:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.12 2011/03/11 02:40:28 vapier Exp $
 
 int_to_KV() {
 	local version=$1 major minor micro
@@ -134,6 +134,16 @@
 		echo "Gentoo patchset ${PATCH_VER}" >> csu/Banner
 	fi
 
+	if just_headers ; then
+		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
+			# mips peeps like to screw with us.  if building headers,
+			# we don't have a real compiler, so we can't let them
+			# insert -mabi on us.
+			sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die
+			find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} +
+		fi
+	fi
+
 	epatch_user
 
 	gnuconfig_update



1.17                 sys-libs/glibc/files/eblits/src_compile.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.16&r2=1.17

Index: src_compile.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- src_compile.eblit	10 Nov 2010 21:51:18 -0000	1.16
+++ src_compile.eblit	11 Mar 2011 02:40:28 -0000	1.17
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.16 2010/11/10 21:51:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.17 2011/03/11 02:40:28 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -167,9 +167,10 @@
 	# Nothing is compiled here which would affect the headers for the target.
 	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i
 	# dont care :p.
-	einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}"
+	echo "${S}"/configure ${myconf}
 	CC=gcc \
 	CFLAGS="-O1 -pipe" \
+	CPPFLAGS="-U_FORTIFY_SOURCE" \
 	"${S}"/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -181,6 +182,7 @@
 	fi
 
 	if just_headers ; then
+		export ABI=default
 		toolchain-glibc_headers_compile
 		return
 	fi



1.13                 sys-libs/glibc/files/eblits/src_install.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.12&r2=1.13

Index: src_install.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src_install.eblit	9 Mar 2011 08:11:54 -0000	1.12
+++ src_install.eblit	11 Mar 2011 02:40:28 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.12 2011/03/09 08:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.13 2011/03/11 02:40:28 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -207,6 +207,7 @@
 
 eblit-glibc-src_install() {
 	if just_headers ; then
+		export ABI=default
 		toolchain-glibc_headers_install
 		return
 	fi