www-client/chromium: call strip-flags before appending flags

Closes: https://bugs.gentoo.org/674500
Package-Manager: Portage-2.3.53_p6, Repoman-2.3.12_p37
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/www-client/chromium/chromium-71.0.3578.98.ebuild b/www-client/chromium/chromium-71.0.3578.98.ebuild
index fd9d0c56bc09c7282783c552f0c4181a318524a8..88e3484e883b7989a5de074fb624baafdae4be5d 100644 (file)
--- a/www-client/chromium/chromium-71.0.3578.98.ebuild
+++ b/www-client/chromium/chromium-71.0.3578.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -505,6 +505,23 @@ src_configure() {
        myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
 
        local myarch="$(tc-arch)"
+
+       # Avoid CFLAGS problems, bug #352457, bug #390147.
+       if ! use custom-cflags; then
+               replace-flags "-Os" "-O2"
+               strip-flags
+
+               # Prevent linker from running out of address space, bug #471810 .
+               if use x86; then
+                       filter-flags "-g*"
+               fi
+
+               # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+               if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+                       filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+               fi
+       fi
+
        if [[ $myarch = amd64 ]] ; then
                myconf_gn+=" target_cpu=\"x64\""
                ffmpeg_target_arch=x64
@@ -533,22 +550,6 @@ src_configure() {
        # Disable fatal linker warnings, bug 506268.
        myconf_gn+=" fatal_linker_warnings=false"
 
-       # Avoid CFLAGS problems, bug #352457, bug #390147.
-       if ! use custom-cflags; then
-               replace-flags "-Os" "-O2"
-               strip-flags
-
-               # Prevent linker from running out of address space, bug #471810 .
-               if use x86; then
-                       filter-flags "-g*"
-               fi
-
-               # Prevent libvpx build failures. Bug 530248, 544702, 546984.
-               if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-                       filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-               fi
-       fi
-
        # https://bugs.gentoo.org/588596
        #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
 

diff --git a/www-client/chromium/chromium-72.0.3626.28-r1.ebuild b/www-client/chromium/chromium-72.0.3626.28-r1.ebuild
index 814e42f8bfce2874ba211c135896fe2b1fd21e32..0f7a5ab1a5013eca87424d14fe560fdb570e006f 100644 (file)
--- a/www-client/chromium/chromium-72.0.3626.28-r1.ebuild
+++ b/www-client/chromium/chromium-72.0.3626.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -507,6 +507,23 @@ src_configure() {
        myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
 
        local myarch="$(tc-arch)"
+
+       # Avoid CFLAGS problems, bug #352457, bug #390147.
+       if ! use custom-cflags; then
+               replace-flags "-Os" "-O2"
+               strip-flags
+
+               # Prevent linker from running out of address space, bug #471810 .
+               if use x86; then
+                       filter-flags "-g*"
+               fi
+
+               # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+               if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+                       filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+               fi
+       fi
+
        if [[ $myarch = amd64 ]] ; then
                myconf_gn+=" target_cpu=\"x64\""
                ffmpeg_target_arch=x64
@@ -535,22 +552,6 @@ src_configure() {
        # Disable fatal linker warnings, bug 506268.
        myconf_gn+=" fatal_linker_warnings=false"
 
-       # Avoid CFLAGS problems, bug #352457, bug #390147.
-       if ! use custom-cflags; then
-               replace-flags "-Os" "-O2"
-               strip-flags
-
-               # Prevent linker from running out of address space, bug #471810 .
-               if use x86; then
-                       filter-flags "-g*"
-               fi
-
-               # Prevent libvpx build failures. Bug 530248, 544702, 546984.
-               if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-                       filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-               fi
-       fi
-
        # https://bugs.gentoo.org/588596
        #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)