| 1 |
commit: 4f9c7396f2c71d160d79f0320126ef63d6f981c7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 13 01:04:59 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 02:49:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9c7396 |
| 7 |
|
| 8 |
toolchain.eclass: followup style tweaks |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/toolchain.eclass | 18 ++++++++++++------ |
| 13 |
1 file changed, 12 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 16 |
index d6c20a9e1e97..0bc6bb821ab0 100644 |
| 17 |
--- a/eclass/toolchain.eclass |
| 18 |
+++ b/eclass/toolchain.eclass |
| 19 |
@@ -27,7 +27,7 @@ tc_is_live() { |
| 20 |
|
| 21 |
if tc_is_live ; then |
| 22 |
EGIT_REPO_URI="https://gcc.gnu.org/git/gcc.git" |
| 23 |
- # naming style: |
| 24 |
+ # Naming style: |
| 25 |
# gcc-10.1.0_pre9999 -> gcc-10-branch |
| 26 |
# Note that the micro version is required or lots of stuff will break. |
| 27 |
# To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before |
| 28 |
@@ -121,7 +121,7 @@ fi |
| 29 |
|
| 30 |
DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}} |
| 31 |
|
| 32 |
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory. |
| 33 |
+# Don't install in /usr/include/g++-v3/, but instead to gcc's internal directory. |
| 34 |
# We will handle /usr/include/g++-v3/ with gcc-config ... |
| 35 |
STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}} |
| 36 |
|
| 37 |
@@ -148,11 +148,14 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then |
| 38 |
IUSE+=" objc-gc" TC_FEATURES+=( objc-gc ) |
| 39 |
IUSE+=" libssp objc++" |
| 40 |
IUSE+=" +openmp" |
| 41 |
+ |
| 42 |
tc_version_is_at_least 4.3 && IUSE+=" fixed-point" |
| 43 |
tc_version_is_at_least 4.7 && IUSE+=" go" |
| 44 |
+ |
| 45 |
# sanitizer support appeared in gcc-4.8, but <gcc-5 does not |
| 46 |
# support modern glibc. |
| 47 |
tc_version_is_at_least 5 && IUSE+=" +sanitize" TC_FEATURES+=( sanitize ) |
| 48 |
+ |
| 49 |
# Note: |
| 50 |
# <gcc-4.8 supported graphite, it required forked ppl |
| 51 |
# versions which we dropped. Since graphite was also experimental in |
| 52 |
@@ -161,15 +164,18 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then |
| 53 |
# <gcc-6.5 supported graphite, it required old incompatible isl |
| 54 |
tc_version_is_at_least 6.5 && |
| 55 |
IUSE+=" graphite" TC_FEATURES+=( graphite ) |
| 56 |
+ |
| 57 |
tc_version_is_between 4.9 8 && IUSE+=" cilk" |
| 58 |
tc_version_is_at_least 4.9 && IUSE+=" ada" |
| 59 |
tc_version_is_at_least 4.9 && IUSE+=" vtv" |
| 60 |
tc_version_is_at_least 5.0 && IUSE+=" jit" |
| 61 |
tc_version_is_between 5.0 9 && IUSE+=" mpx" |
| 62 |
tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch" |
| 63 |
+ |
| 64 |
# systemtap is a gentoo-specific switch: bug #654748 |
| 65 |
tc_version_is_at_least 8.0 && |
| 66 |
IUSE+=" systemtap" TC_FEATURES+=( systemtap ) |
| 67 |
+ |
| 68 |
tc_version_is_at_least 9.0 && IUSE+=" d" |
| 69 |
tc_version_is_at_least 9.1 && IUSE+=" lto" |
| 70 |
tc_version_is_at_least 10 && IUSE+=" cet" |
| 71 |
@@ -362,7 +368,7 @@ get_gcc_src_uri() { |
| 72 |
if tc_is_live ; then |
| 73 |
: # Nothing to do w/git snapshots. |
| 74 |
elif [[ -n ${GCC_TARBALL_SRC_URI} ]] ; then |
| 75 |
- # pull gcc tarball from another location. Frequently used by gnat-gpl. |
| 76 |
+ # Pull gcc tarball from another location. Frequently used by gnat-gpl. |
| 77 |
GCC_SRC_URI="${GCC_TARBALL_SRC_URI}" |
| 78 |
elif [[ -n ${SNAPSHOT} ]] ; then |
| 79 |
GCC_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.xz" |
| 80 |
@@ -564,7 +570,7 @@ do_gcc_PIE_patches() { |
| 81 |
want_pie || return 0 |
| 82 |
use vanilla && return 0 |
| 83 |
|
| 84 |
- einfo "Applying pie patches ..." |
| 85 |
+ einfo "Applying PIE patches ..." |
| 86 |
eapply "${WORKDIR}"/piepatch/*.patch |
| 87 |
|
| 88 |
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" |
| 89 |
@@ -649,7 +655,7 @@ make_gcc_hard() { |
| 90 |
fi |
| 91 |
fi |
| 92 |
|
| 93 |
- # We want to be able to control the PIEe patch logic via something other |
| 94 |
+ # We want to be able to control the PIE patch logic via something other |
| 95 |
# than ALL_CFLAGS... |
| 96 |
sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \ |
| 97 |
-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \ |
| 98 |
@@ -747,7 +753,7 @@ toolchain_src_configure() { |
| 99 |
# issues with 3rd party jar implementations. bug #384291 |
| 100 |
export JAR=no |
| 101 |
|
| 102 |
- # For hardened gcc 4.3 piepatchset to build the hardened specs |
| 103 |
+ # For hardened gcc 4.3: add the pie patchset to build the hardened specs |
| 104 |
# file (build.specs) to use when building gcc. |
| 105 |
if ! tc_version_is_at_least 4.4 && want_minispecs ; then |
| 106 |
setup_minispecs_gcc_build_specs |
Archives