summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-10-07 05:11:11 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-10-07 05:11:11 +0000
commit942e32aeaa4441a1db999a9a6f327652dcac4bb7 (patch)
tree471a8539686298050b4175714751460309d103fe /sys-libs
parentremoving comments where I didn't mean to put them. (diff)
downloadgentoo-2-942e32aeaa4441a1db999a9a6f327652dcac4bb7.tar.gz
gentoo-2-942e32aeaa4441a1db999a9a6f327652dcac4bb7.tar.bz2
gentoo-2-942e32aeaa4441a1db999a9a6f327652dcac4bb7.zip
Don't do the CC setting hack if you've got eselect-compiler as that sets everything up correctly.
(Portage version: 2.0.53_rc3)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog8
-rw-r--r--sys-libs/glibc/glibc-2.3.5-r2.ebuild4
-rw-r--r--sys-libs/glibc/glibc-2.3.5.20050421.ebuild4
-rw-r--r--sys-libs/glibc/glibc-2.3.5.20050722.ebuild4
4 files changed, 13 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a98a059fa33c..f806d70754a0 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.393 2005/10/07 03:12:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.394 2005/10/07 05:11:11 eradicator Exp $
+
+ 07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050421.ebuild,
+ glibc-2.3.5.20050722.ebuild:
+ Don't do the CC setting hack if you've got eselect-compiler as that sets
+ everything up correctly.
07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:
diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index d535cae48f26..b5b58d27c47c 100644
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.5 2005/10/07 03:43:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.6 2005/10/07 05:11:11 eradicator Exp $
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
@@ -913,7 +913,7 @@ glibc_do_configure() {
--libexecdir=$(alt_prefix)/lib/misc/glibc
${EXTRA_ECONF}"
- export CC="$(tc-getCC ${CTARGET})"
+ has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
mkdir -p ${GBUILDDIR}
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index e4b9afa8bd3e..fdc2f8cca032 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.37 2005/09/22 06:10:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.38 2005/10/07 05:11:11 eradicator Exp $
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
@@ -904,7 +904,7 @@ glibc_do_configure() {
--libexecdir=$(alt_prefix)/lib/misc/glibc
${EXTRA_ECONF}"
- export CC="$(tc-getCC ${CTARGET})"
+ has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
mkdir -p ${GBUILDDIR}
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index c83f1cb57a7f..df233d424c78 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.21 2005/10/07 03:43:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.22 2005/10/07 05:11:11 eradicator Exp $
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
@@ -917,7 +917,7 @@ glibc_do_configure() {
--libexecdir=$(alt_prefix)/lib/misc/glibc
${EXTRA_ECONF}"
- export CC="$(tc-getCC ${CTARGET})"
+ has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
mkdir -p ${GBUILDDIR}