commit: 897831538c5699aa4dcfe53e85f01fb6a913430d Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 10 17:31:51 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Oct 24 09:34:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89783153
app-editors/emacs: Restore replacing -O[3-9] by -O2 in CFLAGS This partially reverts commit 4ca8019087aab182e0f3f1211f235f128d537b8a. Bug: https://bugs.gentoo.org/839405 Closes: https://bugs.gentoo.org/941225 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/emacs/emacs-26.3-r19.ebuild | 3 ++- app-editors/emacs/emacs-27.2-r17.ebuild | 4 +++- app-editors/emacs/emacs-28.2-r13.ebuild | 4 +++- app-editors/emacs/emacs-29.4.ebuild | 4 +++- app-editors/emacs/emacs-30.0.91.ebuild | 4 +++- app-editors/emacs/emacs-30.0.9999-r1.ebuild | 4 +++- app-editors/emacs/emacs-31.0.9999.ebuild | 4 +++- 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r19.ebuild b/app-editors/emacs/emacs-26.3-r19.ebuild index 1fb9cb7f2f7f..4fce2690b4f9 100644 --- a/app-editors/emacs/emacs-26.3-r19.ebuild +++ b/app-editors/emacs/emacs-26.3-r19.ebuild @@ -119,9 +119,10 @@ src_prepare() { src_configure() { strip-flags filter-flags -pie #526948 - replace-flags "-O[3-9]" -O2 + replace-flags "-O[3-9]" -O2 #839405 # We want floating-point arithmetic to be correct #933380 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf diff --git a/app-editors/emacs/emacs-27.2-r17.ebuild b/app-editors/emacs/emacs-27.2-r17.ebuild index db9b0cc4c050..cb1eb9824a1f 100644 --- a/app-editors/emacs/emacs-27.2-r17.ebuild +++ b/app-editors/emacs/emacs-27.2-r17.ebuild @@ -160,8 +160,10 @@ src_prepare() { } src_configure() { + replace-flags "-O[3-9]" -O2 #839405 + # We want floating-point arithmetic to be correct #933380 - replace-flags -Ofast -O3 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf diff --git a/app-editors/emacs/emacs-28.2-r13.ebuild b/app-editors/emacs/emacs-28.2-r13.ebuild index f7e8fa9848ff..7af80421f66d 100644 --- a/app-editors/emacs/emacs-28.2-r13.ebuild +++ b/app-editors/emacs/emacs-28.2-r13.ebuild @@ -184,8 +184,10 @@ src_prepare() { } src_configure() { + replace-flags "-O[3-9]" -O2 #839405 + # We want floating-point arithmetic to be correct #933380 - replace-flags -Ofast -O3 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf diff --git a/app-editors/emacs/emacs-29.4.ebuild b/app-editors/emacs/emacs-29.4.ebuild index e5cacab45886..e8ff177693e1 100644 --- a/app-editors/emacs/emacs-29.4.ebuild +++ b/app-editors/emacs/emacs-29.4.ebuild @@ -216,8 +216,10 @@ src_prepare() { } src_configure() { + replace-flags "-O[3-9]" -O2 #839405 + # We want floating-point arithmetic to be correct #933380 - replace-flags -Ofast -O3 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild index b151a0271ab1..3c000ffedb94 100644 --- a/app-editors/emacs/emacs-30.0.91.ebuild +++ b/app-editors/emacs/emacs-30.0.91.ebuild @@ -213,8 +213,10 @@ src_prepare() { } src_configure() { + replace-flags "-O[3-9]" -O2 #839405 + # We want floating-point arithmetic to be correct #933380 - replace-flags -Ofast -O3 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild index b151a0271ab1..3c000ffedb94 100644 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild @@ -213,8 +213,10 @@ src_prepare() { } src_configure() { + replace-flags "-O[3-9]" -O2 #839405 + # We want floating-point arithmetic to be correct #933380 - replace-flags -Ofast -O3 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index 37f94d0002ec..33390f3a6274 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -213,8 +213,10 @@ src_prepare() { } src_configure() { + replace-flags "-O[3-9]" -O2 #839405 + # We want floating-point arithmetic to be correct #933380 - replace-flags -Ofast -O3 + replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off local myconf
