From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BBCA158091 for ; Tue, 7 Jun 2022 08:05:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EEB4E087A; Tue, 7 Jun 2022 08:05:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BAEEE087A for ; Tue, 7 Jun 2022 08:05:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0824D341858 for ; Tue, 7 Jun 2022 08:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C0D8471 for ; Tue, 7 Jun 2022 08:05:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1654589099.5f58c0be83b23be42aa2e6452c4b4bfd875fcbbb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python/python-2.7.18_p15.ebuild dev-lang/python/python-3.10.5.ebuild dev-lang/python/python-3.11.0_beta3.ebuild dev-lang/python/python-3.8.13_p2.ebuild dev-lang/python/python-3.9.13.ebuild X-VCS-Directories: dev-lang/python/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f58c0be83b23be42aa2e6452c4b4bfd875fcbbb X-VCS-Branch: master Date: Tue, 7 Jun 2022 08:05:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 607ebfb1-1f47-4dcf-b647-5d0629009634 X-Archives-Hash: 5944a6cf32d8242790b915b637525f87 commit: 5f58c0be83b23be42aa2e6452c4b4bfd875fcbbb Author: Sam James gentoo org> AuthorDate: Tue Jun 7 08:02:54 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 7 08:04:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f58c0be dev-lang/python: drop long-obsolete SSP / -O3 workaround Everyone in Gentoo (unless they unforce defaults) had, for years now, -fstack-protector-all on, or nowadays, -fstack-protector-strong. This means that it won't have been explicitly in *FLAGS and hence the replacement won't have been triggered anyway. Plus, the hardened conditional is irrelevant given the above (it uses no more SSP than the default, because the default is what hardened used to be, many years ago). Bug: https://bugs.gentoo.org/50309 Signed-off-by: Sam James gentoo.org> dev-lang/python/python-2.7.18_p15.ebuild | 6 ------ dev-lang/python/python-3.10.5.ebuild | 6 ------ dev-lang/python/python-3.11.0_beta3.ebuild | 6 ------ dev-lang/python/python-3.8.13_p2.ebuild | 6 ------ dev-lang/python/python-3.9.13.ebuild | 6 ------ 5 files changed, 30 deletions(-) diff --git a/dev-lang/python/python-2.7.18_p15.ebuild b/dev-lang/python/python-2.7.18_p15.ebuild index 97ebaf232b12..ae39dfe4b580 100644 --- a/dev-lang/python/python-2.7.18_p15.ebuild +++ b/dev-lang/python/python-2.7.18_p15.ebuild @@ -146,12 +146,6 @@ src_configure() { filter-flags -malign-double - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - if tc-is-cross-compiler; then # Force some tests that try to poke fs paths. export ac_cv_file__dev_ptc=no diff --git a/dev-lang/python/python-3.10.5.ebuild b/dev-lang/python/python-3.10.5.ebuild index 87ba9d3a2e1d..18d079692b96 100644 --- a/dev-lang/python/python-3.10.5.ebuild +++ b/dev-lang/python/python-3.10.5.ebuild @@ -151,12 +151,6 @@ src_configure() { filter-flags -malign-double - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - # https://bugs.gentoo.org/700012 if is-flagq -flto || is-flagq '-flto=*'; then append-cflags $(test-flags-CC -ffat-lto-objects) diff --git a/dev-lang/python/python-3.11.0_beta3.ebuild b/dev-lang/python/python-3.11.0_beta3.ebuild index 57e6c4928123..155e017bf32a 100644 --- a/dev-lang/python/python-3.11.0_beta3.ebuild +++ b/dev-lang/python/python-3.11.0_beta3.ebuild @@ -138,12 +138,6 @@ src_configure() { filter-flags -malign-double - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - # https://bugs.gentoo.org/700012 if is-flagq -flto || is-flagq '-flto=*'; then append-cflags $(test-flags-CC -ffat-lto-objects) diff --git a/dev-lang/python/python-3.8.13_p2.ebuild b/dev-lang/python/python-3.8.13_p2.ebuild index ef56899f1fee..d207e46c5342 100644 --- a/dev-lang/python/python-3.8.13_p2.ebuild +++ b/dev-lang/python/python-3.8.13_p2.ebuild @@ -134,12 +134,6 @@ src_configure() { filter-flags -malign-double - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - # https://bugs.gentoo.org/700012 if is-flagq -flto || is-flagq '-flto=*'; then append-cflags $(test-flags-CC -ffat-lto-objects) diff --git a/dev-lang/python/python-3.9.13.ebuild b/dev-lang/python/python-3.9.13.ebuild index ace30db0b27b..5bf7ffed2667 100644 --- a/dev-lang/python/python-3.9.13.ebuild +++ b/dev-lang/python/python-3.9.13.ebuild @@ -146,12 +146,6 @@ src_configure() { filter-flags -malign-double - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - # https://bugs.gentoo.org/700012 if is-flagq -flto || is-flagq '-flto=*'; then append-cflags $(test-flags-CC -ffat-lto-objects)