| 1 |
commit: 5f58c0be83b23be42aa2e6452c4b4bfd875fcbbb |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 7 08:02:54 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 7 08:04:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f58c0be |
| 7 |
|
| 8 |
dev-lang/python: drop long-obsolete SSP / -O3 workaround |
| 9 |
|
| 10 |
Everyone in Gentoo (unless they unforce defaults) had, for years now, |
| 11 |
-fstack-protector-all on, or nowadays, -fstack-protector-strong. |
| 12 |
|
| 13 |
This means that it won't have been explicitly in *FLAGS and hence |
| 14 |
the replacement won't have been triggered anyway. |
| 15 |
|
| 16 |
Plus, the hardened conditional is irrelevant given the above |
| 17 |
(it uses no more SSP than the default, because the default |
| 18 |
is what hardened used to be, many years ago). |
| 19 |
|
| 20 |
Bug: https://bugs.gentoo.org/50309 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
|
| 23 |
dev-lang/python/python-2.7.18_p15.ebuild | 6 ------ |
| 24 |
dev-lang/python/python-3.10.5.ebuild | 6 ------ |
| 25 |
dev-lang/python/python-3.11.0_beta3.ebuild | 6 ------ |
| 26 |
dev-lang/python/python-3.8.13_p2.ebuild | 6 ------ |
| 27 |
dev-lang/python/python-3.9.13.ebuild | 6 ------ |
| 28 |
5 files changed, 30 deletions(-) |
| 29 |
|
| 30 |
diff --git a/dev-lang/python/python-2.7.18_p15.ebuild b/dev-lang/python/python-2.7.18_p15.ebuild |
| 31 |
index 97ebaf232b12..ae39dfe4b580 100644 |
| 32 |
--- a/dev-lang/python/python-2.7.18_p15.ebuild |
| 33 |
+++ b/dev-lang/python/python-2.7.18_p15.ebuild |
| 34 |
@@ -146,12 +146,6 @@ src_configure() { |
| 35 |
|
| 36 |
filter-flags -malign-double |
| 37 |
|
| 38 |
- # https://bugs.gentoo.org/show_bug.cgi?id=50309 |
| 39 |
- if is-flagq -O3; then |
| 40 |
- is-flagq -fstack-protector-all && replace-flags -O3 -O2 |
| 41 |
- use hardened && replace-flags -O3 -O2 |
| 42 |
- fi |
| 43 |
- |
| 44 |
if tc-is-cross-compiler; then |
| 45 |
# Force some tests that try to poke fs paths. |
| 46 |
export ac_cv_file__dev_ptc=no |
| 47 |
|
| 48 |
diff --git a/dev-lang/python/python-3.10.5.ebuild b/dev-lang/python/python-3.10.5.ebuild |
| 49 |
index 87ba9d3a2e1d..18d079692b96 100644 |
| 50 |
--- a/dev-lang/python/python-3.10.5.ebuild |
| 51 |
+++ b/dev-lang/python/python-3.10.5.ebuild |
| 52 |
@@ -151,12 +151,6 @@ src_configure() { |
| 53 |
|
| 54 |
filter-flags -malign-double |
| 55 |
|
| 56 |
- # https://bugs.gentoo.org/show_bug.cgi?id=50309 |
| 57 |
- if is-flagq -O3; then |
| 58 |
- is-flagq -fstack-protector-all && replace-flags -O3 -O2 |
| 59 |
- use hardened && replace-flags -O3 -O2 |
| 60 |
- fi |
| 61 |
- |
| 62 |
# https://bugs.gentoo.org/700012 |
| 63 |
if is-flagq -flto || is-flagq '-flto=*'; then |
| 64 |
append-cflags $(test-flags-CC -ffat-lto-objects) |
| 65 |
|
| 66 |
diff --git a/dev-lang/python/python-3.11.0_beta3.ebuild b/dev-lang/python/python-3.11.0_beta3.ebuild |
| 67 |
index 57e6c4928123..155e017bf32a 100644 |
| 68 |
--- a/dev-lang/python/python-3.11.0_beta3.ebuild |
| 69 |
+++ b/dev-lang/python/python-3.11.0_beta3.ebuild |
| 70 |
@@ -138,12 +138,6 @@ src_configure() { |
| 71 |
|
| 72 |
filter-flags -malign-double |
| 73 |
|
| 74 |
- # https://bugs.gentoo.org/show_bug.cgi?id=50309 |
| 75 |
- if is-flagq -O3; then |
| 76 |
- is-flagq -fstack-protector-all && replace-flags -O3 -O2 |
| 77 |
- use hardened && replace-flags -O3 -O2 |
| 78 |
- fi |
| 79 |
- |
| 80 |
# https://bugs.gentoo.org/700012 |
| 81 |
if is-flagq -flto || is-flagq '-flto=*'; then |
| 82 |
append-cflags $(test-flags-CC -ffat-lto-objects) |
| 83 |
|
| 84 |
diff --git a/dev-lang/python/python-3.8.13_p2.ebuild b/dev-lang/python/python-3.8.13_p2.ebuild |
| 85 |
index ef56899f1fee..d207e46c5342 100644 |
| 86 |
--- a/dev-lang/python/python-3.8.13_p2.ebuild |
| 87 |
+++ b/dev-lang/python/python-3.8.13_p2.ebuild |
| 88 |
@@ -134,12 +134,6 @@ src_configure() { |
| 89 |
|
| 90 |
filter-flags -malign-double |
| 91 |
|
| 92 |
- # https://bugs.gentoo.org/show_bug.cgi?id=50309 |
| 93 |
- if is-flagq -O3; then |
| 94 |
- is-flagq -fstack-protector-all && replace-flags -O3 -O2 |
| 95 |
- use hardened && replace-flags -O3 -O2 |
| 96 |
- fi |
| 97 |
- |
| 98 |
# https://bugs.gentoo.org/700012 |
| 99 |
if is-flagq -flto || is-flagq '-flto=*'; then |
| 100 |
append-cflags $(test-flags-CC -ffat-lto-objects) |
| 101 |
|
| 102 |
diff --git a/dev-lang/python/python-3.9.13.ebuild b/dev-lang/python/python-3.9.13.ebuild |
| 103 |
index ace30db0b27b..5bf7ffed2667 100644 |
| 104 |
--- a/dev-lang/python/python-3.9.13.ebuild |
| 105 |
+++ b/dev-lang/python/python-3.9.13.ebuild |
| 106 |
@@ -146,12 +146,6 @@ src_configure() { |
| 107 |
|
| 108 |
filter-flags -malign-double |
| 109 |
|
| 110 |
- # https://bugs.gentoo.org/show_bug.cgi?id=50309 |
| 111 |
- if is-flagq -O3; then |
| 112 |
- is-flagq -fstack-protector-all && replace-flags -O3 -O2 |
| 113 |
- use hardened && replace-flags -O3 -O2 |
| 114 |
- fi |
| 115 |
- |
| 116 |
# https://bugs.gentoo.org/700012 |
| 117 |
if is-flagq -flto || is-flagq '-flto=*'; then |
| 118 |
append-cflags $(test-flags-CC -ffat-lto-objects) |
Archives