| 1 |
commit: 92773927df2f0940ce5129d8fc4c6e88e7b11ab2 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 31 18:41:00 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 31 20:42:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92773927 |
| 7 |
|
| 8 |
toolchain.eclass: drop IUSE=boundschecking support |
| 9 |
|
| 10 |
boundschecking patch is superseded by IUSE=sanitize |
| 11 |
|
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/toolchain.eclass | 30 +----------------------------- |
| 15 |
1 file changed, 1 insertion(+), 29 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 18 |
index 104fc541d90..4f4dc83c8d6 100644 |
| 19 |
--- a/eclass/toolchain.eclass |
| 20 |
+++ b/eclass/toolchain.eclass |
| 21 |
@@ -146,7 +146,6 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then |
| 22 |
fi |
| 23 |
IUSE+=" debug +cxx +nptl" TC_FEATURES+=(nptl) |
| 24 |
[[ -n ${PIE_VER} ]] && IUSE+=" nopie" |
| 25 |
- [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" |
| 26 |
[[ -n ${D_VER} ]] && IUSE+=" d" |
| 27 |
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp" |
| 28 |
# fortran support appeared in 4.1, but 4.1 needs outdated mpfr |
| 29 |
@@ -335,13 +334,6 @@ gentoo_urls() { |
| 30 |
# The resulting filename of this tarball will be: |
| 31 |
# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2 |
| 32 |
# |
| 33 |
-# HTB_VER |
| 34 |
-# HTB_GCC_VER |
| 35 |
-# These variables control whether or not an ebuild supports Herman |
| 36 |
-# ten Brugge's bounds-checking patches. If you want to use a patch |
| 37 |
-# for an older gcc version with a new gcc, make sure you set |
| 38 |
-# HTB_GCC_VER to that version of gcc. |
| 39 |
-# |
| 40 |
# CYGWINPORTS_GITREV |
| 41 |
# If set, this variable signals that we should apply additional patches |
| 42 |
# maintained by upstream Cygwin developers at github/cygwinports/gcc, |
| 43 |
@@ -386,16 +378,6 @@ get_gcc_src_uri() { |
| 44 |
[[ -n ${SPECS_VER} ]] && \ |
| 45 |
GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)" |
| 46 |
|
| 47 |
- # gcc bounds checking patch |
| 48 |
- if [[ -n ${HTB_VER} ]] ; then |
| 49 |
- local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" |
| 50 |
- GCC_SRC_URI+=" |
| 51 |
- boundschecking? ( |
| 52 |
- mirror://sourceforge/boundschecking/${HTBFILE} |
| 53 |
- $(gentoo_urls ${HTBFILE}) |
| 54 |
- )" |
| 55 |
- fi |
| 56 |
- |
| 57 |
[[ -n ${D_VER} ]] && \ |
| 58 |
GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )" |
| 59 |
|
| 60 |
@@ -482,7 +464,6 @@ toolchain_src_prepare() { |
| 61 |
fi |
| 62 |
|
| 63 |
do_gcc_gentoo_patches |
| 64 |
- do_gcc_HTB_patches |
| 65 |
do_gcc_PIE_patches |
| 66 |
do_gcc_CYGWINPORTS_patches |
| 67 |
|
| 68 |
@@ -607,14 +588,6 @@ do_gcc_gentoo_patches() { |
| 69 |
fi |
| 70 |
} |
| 71 |
|
| 72 |
-do_gcc_HTB_patches() { |
| 73 |
- use_if_iuse boundschecking || return 0 |
| 74 |
- |
| 75 |
- # modify the bounds checking patch with a regression patch |
| 76 |
- tc_apply_patches "Bounds checking patch" "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch" |
| 77 |
- BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}" |
| 78 |
-} |
| 79 |
- |
| 80 |
do_gcc_PIE_patches() { |
| 81 |
want_pie || return 0 |
| 82 |
use vanilla && return 0 |
| 83 |
@@ -1680,8 +1653,7 @@ gcc_do_make() { |
| 84 |
|
| 85 |
# Older versions of GCC could not do profiledbootstrap in parallel due to |
| 86 |
# collisions with profiling info. |
| 87 |
- # boundschecking also seems to introduce parallel build issues. |
| 88 |
- if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] || use_if_iuse boundschecking ; then |
| 89 |
+ if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]]; then |
| 90 |
! tc_version_is_at_least 4.6 && export MAKEOPTS="${MAKEOPTS} -j1" |
| 91 |
fi |
Archives