From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 25 Dec 2017 18:05:53 +0000 (+0100)
Subject: media-video/vlc: Replace -Os with -O2 for x86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=882c60ab883d6647d986339256ab8b9be77acdba;p=gentoo.git

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 fc781d24d8fb..bdc58178d60a 100644
--- 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 1b4cff006f19..61ec7e46d584 100644
--- 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 ddbc6e4fd4ad..513a854d0f39 100644
--- 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 e235fc8b947a..7925c2465e78 100644
--- 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 be6ba65a29e9..e67e99283315 100644
--- 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