1 |
commit: 91f2491c60e83b240a777abb7630fa81a65ecc2a |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 5 05:07:02 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 5 05:07:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f2491c |
7 |
|
8 |
www-client/chromium: call strip-flags before appending flags |
9 |
|
10 |
Closes: https://bugs.gentoo.org/674500 |
11 |
Package-Manager: Portage-2.3.53_p6, Repoman-2.3.12_p37 |
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
www-client/chromium/chromium-71.0.3578.98.ebuild | 35 +++++++++++----------- |
15 |
.../chromium/chromium-72.0.3626.28-r1.ebuild | 35 +++++++++++----------- |
16 |
2 files changed, 36 insertions(+), 34 deletions(-) |
17 |
|
18 |
diff --git a/www-client/chromium/chromium-71.0.3578.98.ebuild b/www-client/chromium/chromium-71.0.3578.98.ebuild |
19 |
index fd9d0c56bc0..88e3484e883 100644 |
20 |
--- a/www-client/chromium/chromium-71.0.3578.98.ebuild |
21 |
+++ b/www-client/chromium/chromium-71.0.3578.98.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2018 Gentoo Authors |
24 |
+# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=7 |
28 |
@@ -505,6 +505,23 @@ src_configure() { |
29 |
myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
30 |
|
31 |
local myarch="$(tc-arch)" |
32 |
+ |
33 |
+ # Avoid CFLAGS problems, bug #352457, bug #390147. |
34 |
+ if ! use custom-cflags; then |
35 |
+ replace-flags "-Os" "-O2" |
36 |
+ strip-flags |
37 |
+ |
38 |
+ # Prevent linker from running out of address space, bug #471810 . |
39 |
+ if use x86; then |
40 |
+ filter-flags "-g*" |
41 |
+ fi |
42 |
+ |
43 |
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
44 |
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
45 |
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
46 |
+ fi |
47 |
+ fi |
48 |
+ |
49 |
if [[ $myarch = amd64 ]] ; then |
50 |
myconf_gn+=" target_cpu=\"x64\"" |
51 |
ffmpeg_target_arch=x64 |
52 |
@@ -533,22 +550,6 @@ src_configure() { |
53 |
# Disable fatal linker warnings, bug 506268. |
54 |
myconf_gn+=" fatal_linker_warnings=false" |
55 |
|
56 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
57 |
- if ! use custom-cflags; then |
58 |
- replace-flags "-Os" "-O2" |
59 |
- strip-flags |
60 |
- |
61 |
- # Prevent linker from running out of address space, bug #471810 . |
62 |
- if use x86; then |
63 |
- filter-flags "-g*" |
64 |
- fi |
65 |
- |
66 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
67 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
68 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
69 |
- fi |
70 |
- fi |
71 |
- |
72 |
# https://bugs.gentoo.org/588596 |
73 |
#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
74 |
|
75 |
|
76 |
diff --git a/www-client/chromium/chromium-72.0.3626.28-r1.ebuild b/www-client/chromium/chromium-72.0.3626.28-r1.ebuild |
77 |
index 814e42f8bfc..0f7a5ab1a50 100644 |
78 |
--- a/www-client/chromium/chromium-72.0.3626.28-r1.ebuild |
79 |
+++ b/www-client/chromium/chromium-72.0.3626.28-r1.ebuild |
80 |
@@ -1,4 +1,4 @@ |
81 |
-# Copyright 1999-2018 Gentoo Authors |
82 |
+# Copyright 1999-2019 Gentoo Authors |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
|
85 |
EAPI=7 |
86 |
@@ -507,6 +507,23 @@ src_configure() { |
87 |
myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
88 |
|
89 |
local myarch="$(tc-arch)" |
90 |
+ |
91 |
+ # Avoid CFLAGS problems, bug #352457, bug #390147. |
92 |
+ if ! use custom-cflags; then |
93 |
+ replace-flags "-Os" "-O2" |
94 |
+ strip-flags |
95 |
+ |
96 |
+ # Prevent linker from running out of address space, bug #471810 . |
97 |
+ if use x86; then |
98 |
+ filter-flags "-g*" |
99 |
+ fi |
100 |
+ |
101 |
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
102 |
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
103 |
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
104 |
+ fi |
105 |
+ fi |
106 |
+ |
107 |
if [[ $myarch = amd64 ]] ; then |
108 |
myconf_gn+=" target_cpu=\"x64\"" |
109 |
ffmpeg_target_arch=x64 |
110 |
@@ -535,22 +552,6 @@ src_configure() { |
111 |
# Disable fatal linker warnings, bug 506268. |
112 |
myconf_gn+=" fatal_linker_warnings=false" |
113 |
|
114 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
115 |
- if ! use custom-cflags; then |
116 |
- replace-flags "-Os" "-O2" |
117 |
- strip-flags |
118 |
- |
119 |
- # Prevent linker from running out of address space, bug #471810 . |
120 |
- if use x86; then |
121 |
- filter-flags "-g*" |
122 |
- fi |
123 |
- |
124 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
125 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
126 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
127 |
- fi |
128 |
- fi |
129 |
- |
130 |
# https://bugs.gentoo.org/588596 |
131 |
#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |