media-video/vlc: Replace -Os with -O2 for x86

Closes: https://bugs.gentoo.org/569774
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index fc781d24d8fbdb7f16abe47a7687c123667e2f12..bdc58178d60ad184b00095f921e69695ecea9d6e 100644 (file)
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -261,8 +261,12 @@ src_configure() {
        # Compatibility fix for Samba 4.
        use samba && append-cppflags "-I/usr/include/samba-4.0"
 
-       # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-       use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+       if use x86; then
+               # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+               append-cflags $(test-flags-CC -fno-stack-check)
+               # Bug 569774
+               replace-flags -Os -O2
+       fi
 
        # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
        append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"

diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild
index 1b4cff006f1998cf4d27a074c9a4a9b458345141..61ec7e46d584b37a5b0683622ca07fd752536520 100644 (file)
--- a/media-video/vlc/vlc-2.2.8.ebuild
+++ b/media-video/vlc/vlc-2.2.8.ebuild
@@ -257,8 +257,12 @@ src_configure() {
        # Compatibility fix for Samba 4.
        use samba && append-cppflags "-I/usr/include/samba-4.0"
 
-       # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-       use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+       if use x86; then
+               # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+               append-cflags $(test-flags-CC -fno-stack-check)
+               # Bug 569774
+               replace-flags -Os -O2
+       fi
 
        # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
        append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index ddbc6e4fd4ad40e6e70924a726f99da8baaab346..513a854d0f391a687fc929ada090739bc4e42fcf 100644 (file)
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -261,8 +261,12 @@ src_configure() {
        # Compatibility fix for Samba 4.
        use samba && append-cppflags "-I/usr/include/samba-4.0"
 
-       # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-       use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+       if use x86; then
+               # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+               append-cflags $(test-flags-CC -fno-stack-check)
+               # Bug 569774
+               replace-flags -Os -O2
+       fi
 
        # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
        append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index e235fc8b947aeafee4cb894bd70283d8d15d4246..7925c2465e78653729ce56d42a37a665773d6018 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -279,8 +279,12 @@ src_configure() {
        # Compatibility fix for Samba 4.
        use samba && append-cppflags "-I/usr/include/samba-4.0"
 
-       # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-       use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+       if use x86; then
+               # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+               append-cflags $(test-flags-CC -fno-stack-check)
+               # Bug 569774
+               replace-flags -Os -O2
+       fi
 
        # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
        append-cxxflags -std=c++11

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index be6ba65a29e973b43f3a44914a70c305a73f7c12..e67e9928331568e8273803d33bfddb1392bd1fe4 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -279,8 +279,12 @@ src_configure() {
        # Compatibility fix for Samba 4.
        use samba && append-cppflags "-I/usr/include/samba-4.0"
 
-       # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-       use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+       if use x86; then
+               # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+               append-cflags $(test-flags-CC -fno-stack-check)
+               # Bug 569774
+               replace-flags -Os -O2
+       fi
 
        # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
        append-cxxflags -std=c++11