summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-12-12 17:33:10 +0000
committerMike Frysinger <vapier@gentoo.org>2011-12-12 17:33:10 +0000
commit7760444d30a6dc157b7f18d3a37ad5dee43988aa (patch)
treed4a3157c82a82258dcf4e06728990ca593f9b6a1 /sys-libs/glibc/files
parentStable for AMD64, wrt bug #394231 (diff)
downloadhistorical-7760444d30a6dc157b7f18d3a37ad5dee43988aa.tar.gz
historical-7760444d30a6dc157b7f18d3a37ad5dee43988aa.tar.bz2
historical-7760444d30a6dc157b7f18d3a37ad5dee43988aa.zip
Install all the same files with the cross-compiler so people can re-use it with native installs.
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/glibc/files')
-rw-r--r--sys-libs/glibc/files/eblits/src_compile.eblit6
-rw-r--r--sys-libs/glibc/files/eblits/src_install.eblit8
2 files changed, 2 insertions, 12 deletions
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 0a44688234db..b11639148c72 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-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.19 2011/10/11 21:20:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.20 2011/12/12 17:33:10 vapier Exp $
glibc_do_configure() {
local myconf
@@ -102,10 +102,6 @@ glibc_do_configure() {
cd "${GBUILDDIR}"
echo "${S}"/configure ${myconf}
"${S}"/configure ${myconf} || die "failed to configure glibc"
-
- # since we'll be punting them for cross-compilers, and they can cause
- # problems (ia64+static), we'll just skip building altogether
- is_crosscompile && sed -i '1ibuild-programs = no' config.make
}
toolchain-glibc_src_compile() {
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 00680eaf2221..264dd1a0584d 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.18 2011/12/09 04:53:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.19 2011/12/12 17:33:10 vapier Exp $
toolchain-glibc_src_install() {
local GBUILDDIR
@@ -21,12 +21,6 @@ toolchain-glibc_src_install() {
fi
emake install_root="${install_root}" install || die
- if is_crosscompile ; then
- # punt all the junk not needed by a cross-compiler
- cd "${D}"/usr/${CTARGET} || die
- rm -rf ./{,usr/}{bin,etc,sbin,share} ./{,usr/}*/{gconv,misc}
- fi
-
if want_linuxthreads && want_nptl ; then
einfo "Installing NPTL to $(alt_libdir)/tls/..."
cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl