Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
Date: Tue, 07 Jun 2022 06:44:50
Message-Id: 1654584273.4ca8019087aab182e0f3f1211f235f128d537b8a.ulm@gentoo
1 commit: 4ca8019087aab182e0f3f1211f235f128d537b8a
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 7 06:42:26 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 7 06:44:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca80190
7
8 app-editors/emacs: Leave CFLAGS alone in Emacs 27 and newer
9
10 Closes: https://bugs.gentoo.org/839405
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 app-editors/emacs/emacs-27.2-r5.ebuild | 11 +----------
14 app-editors/emacs/emacs-28.1.ebuild | 11 +----------
15 2 files changed, 2 insertions(+), 20 deletions(-)
16
17 diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
18 index 50165a4c30ce..18395bf3a2ec 100644
19 --- a/app-editors/emacs/emacs-27.2-r5.ebuild
20 +++ b/app-editors/emacs/emacs-27.2-r5.ebuild
21 @@ -3,7 +3,7 @@
22
23 EAPI=8
24
25 -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
26 +inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
27
28 if [[ ${PV##*.} = 9999 ]]; then
29 inherit git-r3
30 @@ -159,15 +159,6 @@ src_prepare() {
31 }
32
33 src_configure() {
34 - strip-flags
35 - filter-flags -pie #526948
36 -
37 - if use ia64; then
38 - replace-flags "-O[2-9]" -O1 #325373
39 - else
40 - replace-flags "-O[3-9]" -O2
41 - fi
42 -
43 local myconf
44
45 if use alsa; then
46
47 diff --git a/app-editors/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
48 index c1f2773fb0b4..69b2645dfb9b 100644
49 --- a/app-editors/emacs/emacs-28.1.ebuild
50 +++ b/app-editors/emacs/emacs-28.1.ebuild
51 @@ -3,7 +3,7 @@
52
53 EAPI=8
54
55 -inherit elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs #autotools
56 +inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
57
58 if [[ ${PV##*.} = 9999 ]]; then
59 inherit git-r3
60 @@ -169,15 +169,6 @@ src_prepare() {
61 }
62
63 src_configure() {
64 - strip-flags
65 - filter-flags -pie #526948
66 -
67 - if use ia64; then
68 - replace-flags "-O[2-9]" -O1 #325373
69 - else
70 - replace-flags "-O[3-9]" -O2
71 - fi
72 -
73 local myconf
74
75 if use alsa; then