From aabccd11070b8b8a65800483ce879c2b46786d87 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 11 Mar 2011 02:40:28 +0000 Subject: Get header-only install working for mips systems #235551 by Joshua Kinard. (Portage version: 2.2.0_alpha26/cvs/Linux x86_64) --- sys-libs/glibc/ChangeLog | 7 ++++++- sys-libs/glibc/files/eblits/src_compile.eblit | 8 +++++--- sys-libs/glibc/files/eblits/src_install.eblit | 3 ++- sys-libs/glibc/files/eblits/src_unpack.eblit | 14 ++++++++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) (limited to 'sys-libs/glibc') diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index f66f5cd4db36..640fe0c1e00d 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.757 2011/03/10 08:04:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.758 2011/03/11 02:40:28 vapier Exp $ + + 11 Mar 2011; Mike Frysinger + files/eblits/src_compile.eblit, files/eblits/src_install.eblit, + files/eblits/src_unpack.eblit: + Get header-only install working for mips systems #235551 by Joshua Kinard. 10 Mar 2011; Mike Frysinger files/eblits/common.eblit: Split out the target-specific flag munging into its own func to make the diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit index c19fecdb67a8..dafd2aa51e95 100644 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ b/sys-libs/glibc/files/eblits/src_compile.eblit @@ -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 @@ toolchain-glibc_headers_compile() { # 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 @@ eblit-glibc-src_compile() { fi if just_headers ; then + export ABI=default toolchain-glibc_headers_compile return fi diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index d5a5a7487644..12c757778711 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -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 @@ src_strip() { eblit-glibc-src_install() { if just_headers ; then + export ABI=default toolchain-glibc_headers_install return fi diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit index d99dc563b39e..a309f7e4ca5d 100644 --- a/sys-libs/glibc/files/eblits/src_unpack.eblit +++ b/sys-libs/glibc/files/eblits/src_unpack.eblit @@ -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 @@ toolchain-glibc_src_unpack() { 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 -- cgit v1.2.3-65-gdbad