summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2011-01-01 00:59:21 +0000
committerRyan Hill <dirtyepic@gentoo.org>2011-01-01 00:59:21 +0000
commit225f30ce1116ecaad01541018796e97cb244d149 (patch)
tree2a8b8ab84cc5bba9be467ffe9982f6376591bac1 /sys-devel
parentFix ESVN_REPO_URI. (diff)
downloadgentoo-2-225f30ce1116ecaad01541018796e97cb244d149.tar.gz
gentoo-2-225f30ce1116ecaad01541018796e97cb244d149.tar.bz2
gentoo-2-225f30ce1116ecaad01541018796e97cb244d149.zip
GET_ENVIRONMENT is poisoned in 4.6. Use getenv() instead. No functional
changes. (Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc/ChangeLog8
-rw-r--r--sys-devel/gcc/files/gcc-spec-env.patch7
2 files changed, 10 insertions, 5 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 0795ec7fe152..ffb4353d2cf0 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/gcc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.798 2010/12/28 01:09:34 dirtyepic Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.799 2011/01/01 00:59:21 dirtyepic Exp $
+
+ 01 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> files/gcc-spec-env.patch:
+ GET_ENVIRONMENT is poisoned in 4.6. Use getenv() instead. No functional
+ changes.
*gcc-4.5.2 (28 Dec 2010)
diff --git a/sys-devel/gcc/files/gcc-spec-env.patch b/sys-devel/gcc/files/gcc-spec-env.patch
index 9d5e666a5441..57e7567e5460 100644
--- a/sys-devel/gcc/files/gcc-spec-env.patch
+++ b/sys-devel/gcc/files/gcc-spec-env.patch
@@ -1,8 +1,9 @@
Add support for external spec file via the GCC_SPECS env var. This
allows us to easily control pie/ssp defaults with gcc-config profiles.
- Original patch by Rob Holland. Extended to support multiple
- entries separated by ':' by Kevin F. Quinn
+ Original patch by Rob Holland
+ Extended to support multiple entries separated by ':' by Kevin F. Quinn
+ Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
--- gcc-4/gcc/gcc.c
+++ gcc-4/gcc/gcc.c
@@ -15,7 +16,7 @@
+ * each spec listed, the string is overwritten at token boundaries
+ * (':') with '\0', an effect of strtok_r().
+ */
-+ GET_ENVIRONMENT (specs_file, "GCC_SPECS");
++ specs_file = getenv ("GCC_SPECS");
+ if (specs_file && (strlen(specs_file) > 0))
+ {
+ char *spec, *saveptr;