commit: cd0d7969d1043802353adf44e97477f8a66fa6c1
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 5 07:29:48 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Dec 5 07:29:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/toolchain.git/commit/?id=cd0d7969
gcc: drop spec-env patch from non-hardened builds #528170
The GCC_SPEC env var is really only used by the hardened minispec
logic, so drop it from the ebuilds that no longer support hardened.
sys-devel/gcc/gcc-4.10.0_pre9999.ebuild | 2 --
sys-devel/gcc/gcc-4.5.1-r1.ebuild | 2 --
sys-devel/gcc/gcc-4.5.2.ebuild | 2 --
sys-devel/gcc/gcc-4.5.3-r2.ebuild | 2 --
sys-devel/gcc/gcc-4.6.0.ebuild | 4 ----
sys-devel/gcc/gcc-4.6.1-r1.ebuild | 4 ----
sys-devel/gcc/gcc-4.6.2.ebuild | 4 ----
sys-devel/gcc/gcc-4.6.3.ebuild | 4 ----
sys-devel/gcc/gcc-4.7.0.ebuild | 4 ----
sys-devel/gcc/gcc-4.7.1.ebuild | 4 ----
sys-devel/gcc/gcc-4.7.2-r1.ebuild | 4 ----
sys-devel/gcc/gcc-4.7.3-r1.ebuild | 4 ----
sys-devel/gcc/gcc-4.8.4_pre9999.ebuild | 2 --
sys-devel/gcc/gcc-4.9.1_pre9999.ebuild | 2 --
14 files changed, 44 deletions(-)
diff --git a/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild
b/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild
index c4b8ca2..e17147a 100644
--- a/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild
@@ -42,8 +42,6 @@ src_prepare() {
EPATCH_EXCLUDE="${FILESDIR}/${GCC_RELEASE_VER}/exclude"
\
EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch
fi
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch
"${GCC_FILESDIR}"/gcc-spec-env-r1.patch
fi
# single-stage build for quick patch testing
diff --git a/sys-devel/gcc/gcc-4.5.1-r1.ebuild
b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
index e0540b4..da3e6c1 100644
--- a/sys-devel/gcc/gcc-4.5.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
@@ -27,6 +27,4 @@ src_prepare() {
use vanilla && return 0
sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.5.2.ebuild b/sys-devel/gcc/gcc-4.5.2.ebuild
index 555f6a4..f21e3f2 100644
--- a/sys-devel/gcc/gcc-4.5.2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.2.ebuild
@@ -27,6 +27,4 @@ src_prepare() {
use vanilla && return 0
sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.5.3-r2.ebuild
b/sys-devel/gcc/gcc-4.5.3-r2.ebuild
index 93ec145..9d23f51 100644
--- a/sys-devel/gcc/gcc-4.5.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.3-r2.ebuild
@@ -27,6 +27,4 @@ src_prepare() {
use vanilla && return 0
sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.6.0.ebuild b/sys-devel/gcc/gcc-4.6.0.ebuild
index 40320a3..1900fe3 100644
--- a/sys-devel/gcc/gcc-4.6.0.ebuild
+++ b/sys-devel/gcc/gcc-4.6.0.ebuild
@@ -27,8 +27,4 @@ src_prepare() {
fi
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.6.1-r1.ebuild
b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
index 5cc8efb..09354e6 100644
--- a/sys-devel/gcc/gcc-4.6.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
@@ -28,8 +28,4 @@ src_prepare() {
fi
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild
index 874e112..9097efa 100644
--- a/sys-devel/gcc/gcc-4.6.2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.2.ebuild
@@ -31,8 +31,4 @@ src_prepare() {
EPATCH_EXCLUDE+=" 80_all_gcc-4.6-x32.patch"
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.6.3.ebuild b/sys-devel/gcc/gcc-4.6.3.ebuild
index 540b356..beb8279 100644
--- a/sys-devel/gcc/gcc-4.6.3.ebuild
+++ b/sys-devel/gcc/gcc-4.6.3.ebuild
@@ -28,8 +28,4 @@ src_prepare() {
fi
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.7.0.ebuild b/sys-devel/gcc/gcc-4.7.0.ebuild
index ece73c3..d6a6357 100644
--- a/sys-devel/gcc/gcc-4.7.0.ebuild
+++ b/sys-devel/gcc/gcc-4.7.0.ebuild
@@ -31,8 +31,4 @@ src_prepare() {
EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.7.1.ebuild b/sys-devel/gcc/gcc-4.7.1.ebuild
index 0fe07b7..2faf4be 100644
--- a/sys-devel/gcc/gcc-4.7.1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.1.ebuild
@@ -31,8 +31,4 @@ src_prepare() {
EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.7.2-r1.ebuild
b/sys-devel/gcc/gcc-4.7.2-r1.ebuild
index 8f2fe7f..167d4fc 100644
--- a/sys-devel/gcc/gcc-4.7.2-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.2-r1.ebuild
@@ -31,8 +31,4 @@ src_prepare() {
EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.7.3-r1.ebuild
b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
index 6bd7ce0..9fd7908 100644
--- a/sys-devel/gcc/gcc-4.7.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
@@ -31,8 +31,4 @@ src_prepare() {
EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
toolchain_src_prepare
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
}
diff --git a/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild
b/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild
index 310702b..85a5883 100644
--- a/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild
@@ -41,8 +41,6 @@ src_prepare() {
EPATCH_EXCLUDE="${FILESDIR}/${GCC_RELEASE_VER}/exclude"
\
EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch
fi
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch
"${GCC_FILESDIR}"/gcc-spec-env-r1.patch
fi
# single-stage build for quick patch testing
diff --git a/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild
b/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild
index 310702b..85a5883 100644
--- a/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild
@@ -41,8 +41,6 @@ src_prepare() {
EPATCH_EXCLUDE="${FILESDIR}/${GCC_RELEASE_VER}/exclude"
\
EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch
fi
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch
"${GCC_FILESDIR}"/gcc-spec-env-r1.patch
fi
# single-stage build for quick patch testing
