Do not pass extra-cflags/cxxflags to configure as those default to CFLAGS/CXXFLAGS respectively. Just disable optflags instead of passing complete CFLAGS to avoid forced -O3 build: This duplicated CFLAGS on the compile line and overridden important ones set by configure script; fixes bug #550554.

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 25 insertions, 25 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 70ab00eb749e..5e07fe60d1c8 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.860 2015/05/29 09:22:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.861 2015/05/29 09:45:15 aballier Exp $
+
+  29 May 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.14.ebuild,
+  ffmpeg-2.2.15.ebuild, ffmpeg-2.6.3.ebuild, ffmpeg-9999.ebuild:
+  Do not pass extra-cflags/cxxflags to configure as those default to
+  CFLAGS/CXXFLAGS respectively. Just disable optflags instead of passing
+  complete CFLAGS to avoid forced -O3 build: This duplicated CFLAGS on the
+  compile line and overridden important ones set by configure script; fixes bug
+  #550554.
 
   29 May 2015; Alexis Ballier <aballier@gentoo.org> -ffmpeg-2.6.1.ebuild,
   -ffmpeg-2.6.2.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 72528690e72e..4712ec42caaf 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,17 +17,17 @@ EBUILD ffmpeg-0.10.16.ebuild 10077 SHA256 78a2ca42d92c398de9d68c8e9198eecf00a6a2
 EBUILD ffmpeg-1.0.10.ebuild 9713 SHA256 6d6ae75be2af88b036b9dff32a15ea2ccea74f02404f22c187de5c1cf0bfb400 SHA512 253a4bfba29398cd1fba6ac6e0f8b6fc5416fd9d86116a4f17af36ee7a50aa5767fa917ecf6f300ad01bef8b8bc58e37582cfedfe94820abd093c26a7f405127 WHIRLPOOL aa180cd1b8ee1d5ff373b02cb942c252daaf05fd4f5ad41155014c6752766ac7f3ad98381435b7999596f06249b64f41ad2955bb1856ece1c6cf88fb96c185f7
 EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5ff963a6a84a67856aeda995d2 SHA512 4680ce2f34e946fffd588133eacbf341e08fd6954b249a50488a7b262d66ef87fa4e830ada253a9db731557fbcbc65b6f08b974a2b50b41c459918aa4b2a8e21 WHIRLPOOL 7142e4fe36428f6561b42da91471cd5f11c9978b0c27d59746371d746961280c1739b2840cbf9577f3808d8f6d8a80f4d42c29ca197c506b613624a34a6be318
 EBUILD ffmpeg-1.2.6-r1.ebuild 11049 SHA256 88d7665d4e89c851182da15a4b4345ff2b037fd26dad1b2e8b18795cc2a5dd02 SHA512 81aa531007bc9d981b32337a25db8b76770a415347b42885e88e6c330c089f2de84cc671783542a8d1c2b4cf59f3a4bf4520a7a0b2ed9c96528a5ea36fc80aeb WHIRLPOOL 830702c5a1f586a7cf655a0e804d4b60375a8bd41048a7dd0b05657459c66f5e2711fc1e6c712e16cdf073a4a5026a74776014e17d61fdf4ded7c22d98b5f0e3
-EBUILD ffmpeg-2.2.14.ebuild 12695 SHA256 890dfa4aa81a8edabc891fe845ac7d249d1485703ea7472cbb4c7edbfcd84c9a SHA512 6e7caa8a7889e4beda9db1908e847923c178805a89f28240711cfc9007b3bb85a2c81632443690dd9ef8df433354df96941ad668972f806140d521b834887f14 WHIRLPOOL 5b8efeecc90c913daabe2b89e809c490a18520bcce24c6f8053bd779fd4b847300b4758ec91c1eb40d0eb011f4f0c13c98e17f9e24cde07cbc59a2b91ab0ced5
-EBUILD ffmpeg-2.2.15.ebuild 12702 SHA256 957e1d8213a22d08505afe07de6c77c160cffdcae980d35b6e7fecf11dc194a7 SHA512 33ee8de96354439dd9f17bbfa2d29c5d98824a6aafc8a22000dbb7cfc1e3f9e1d588e97f9c3712a1e18ca3b34253ae16927c968ca004086afbb3e81d413bf778 WHIRLPOOL 32675b0a4fb8970548bdb846dd980335a8a551f635f45ba9585b95ed9a9df2d8753ed9777f1c33a44ebca71f24ea7f85fc519dcd50e803108ca52883570b1f18
-EBUILD ffmpeg-2.6.3.ebuild 14650 SHA256 579853d57c6a7bf6047ac65450369c6f0b0f752947293d2c697c0eb17cce1bda SHA512 fffa2a1cc1e531cb2b6115312422a3b8936f0b86ef39a518f1da10acb5fae9fae5f766568f6c3fac1de1b4381c100f93b3916294da78bee433a2559e85649731 WHIRLPOOL b3b25e1d39814f8adcff735566bd136884db3bc00bbdc058c590c818dcb99b1ba2e98f89958a069a6743b680f9209c3035a91a0fc7e5262392baf74104c820d3
-EBUILD ffmpeg-9999.ebuild 14651 SHA256 d17bea43115d0e17ac369d32d40336ac345f1738f16ecece98063e4ecd7ea48a SHA512 7b1f0b70eabd3f213bf5c13e4b70fce20102801b3536d931a625cd995fb7296061ac373b79eed89b5e18e4c5851c2f096fdab75d08276427da4255d43153fed2 WHIRLPOOL 48145a3b433ce1299145a0bfe6590788d52402c5d43983e06c556a32bc1e698e6a13d0e72e2f4edd0d659c5ab60fc9139c6e1261be80e208d1923cfd87a5cef0
-MISC ChangeLog 5695 SHA256 fee8e54f69b7aeb84c7d746e9e0f36613d39a1e9f70da05480ec7b9683ecc7c9 SHA512 f9f8e486cb8cad3fa5c2e533c650a2e4469ec50fc9854c829c8f0b18d2ce192257d11a4baf711658ce8736e5415b75b464142a72b43c3d04ec2008b724231c32 WHIRLPOOL c7b54e9303497357f2aeaf50eae6ad3b247ec9c32404de67c3fcf2d4f19badefaa98c340eb40f2c116cc7f5590462bab308a51507372000842e49c37ae561a46
+EBUILD ffmpeg-2.2.14.ebuild 12622 SHA256 ba75159771b77ee69483f7aaaf5ee412d6d0ea3f80f50146b9ddcb700313fbe1 SHA512 ba8af1fed8f5c83a7a2a6981809800bc3cd61ee916738bebd208a589c084d43c5a60722f848940fca7e081b61808c1ae5928becc3686da5df7a4fd98dfd20a11 WHIRLPOOL 6232370ef626a799d67d9f47313f30ec3e14adc7147aa10a917bba34f0aafd259c2ecbc0c8bfadccb3f7f53ea162342ba8cde4d241478d6a556d169951553792
+EBUILD ffmpeg-2.2.15.ebuild 12628 SHA256 204b477a335bb17077ab5752a688b800fa32e743a0a19a4cb4ce9d7ac423fc14 SHA512 d102a27975ccb25f8dcd3883ed4aaa4ffae8b8e675778d3686e38942bd6041f114bbcfa23d24f21c691d5c5f317d4f20c75312fa34eff254f68668995c1a2756 WHIRLPOOL b10837556abead054fbd5dfad7db4c3da54a85c34f2bf713ada6ca59ed20998e9670f2769b8fe1b244daf460fc1277ae69e465c11b79c753925706df8ec8801c
+EBUILD ffmpeg-2.6.3.ebuild 14576 SHA256 13e6e59b99eb8a621cffa371eed747c9b8e9e100fa23e163bde911e325d50c06 SHA512 01dcf090403c586a7b72b7711241ecc5cbe22bf4e5513f8491e42e9c8fdce419352baa435dc3d810cb27ffc09999244283d01cf93c5276446bc66fbe448db6a7 WHIRLPOOL 1cb0143dadf7be8c760dbebf34eff8855cf17bf0afbe33579cfbd7bdfb2f6da5dc953f6b9de954160e00963399ec5c4d45cfe31d4e7c8a52d073f9d4f6590272
+EBUILD ffmpeg-9999.ebuild 14577 SHA256 098f11afd7a5288ffaba31ecaa28ff95cd932bb04e73185a097a4ea3e96b0762 SHA512 9b4aaf44568cfd5a9b089f3278b6f0071b47c6dc22f15f6d508fa2455d3381596e11dc902f7ec0c5ccd03b6b6b6d473dce27fb3bc202a1af635a8fd409c415a7 WHIRLPOOL d5e75d333cdc00671c6e0d7b62c575421a18c9fb3376f20491caefc1bb59626076da7a417717d5308e1739299207f9358e1157fa5070653fef073b839c58e4f5
+MISC ChangeLog 6143 SHA256 71483a8aa5c2996616f3aae1bdd5459f84798aac9057e1a1238980b44e752c3c SHA512 d3719d388b89c0781d77f95657e76c7667d05fea93574c2b48bca184b38ef9fdb493fca34c7be14c8a4a03aa397e983bc588028d06c896c800a68c93ff40ba3e WHIRLPOOL 09b58c114329884d2cc645fbcdbd8535b89a4df3c6045ff214650ebf7d586bda09c2cd834cfb26b9465dd3a03496091fb39f9fbba7c7abfb6f1bfa04d1be731e
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC metadata.xml 4332 SHA256 b39edc51a5c5d68aefb52639412045287dbd670ab5b43a45b13c2c99d085f9a4 SHA512 0744c75f388ae01989b62cc34c49a665fc19dd8b0639c846a16c84a8db06a9cc571c2952df63857dac15bffca6975a0c872ea59c4f490639655f4eddd1b04ccb WHIRLPOOL ce3593918d35986256ee057520e69ebde51e4201e1d20e66f0367d7bf45e5a1a7301b5c7fa02ec327273702e426a2876a81e381c4af78251e729b2982abb41ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVoL9wACgkQvFcC4BYPU0pmhACghbwQXTWX1U6Qhjptg/+gQKPa
-oicAn0gJwibUZ2P5BRb9osNMAwWN8lgs
-=LR9l
+iEYEAREIAAYFAlVoNSwACgkQvFcC4BYPU0qFnACfTJOYC15/PJ1vgRupUdVABN+4
+zJUAnj/WmjKeXpqW16cv5hEJb6FKX36w
+=0L4X
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index 5229921cc491..1835df9e2ded 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.7 2015/05/29 07:37:45 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.8 2015/05/29 09:45:15 aballier Exp $
 
 EAPI="5"
 
@@ -326,9 +326,7 @@ multilib_src_configure() {
 		--cc="$(tc-getCC)" \
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
+		--optflags=" " \
 		$(use_enable static-libs static) \
 		"${myconf[@]}"
 	echo "${@}"
diff --git a/media-video/ffmpeg/ffmpeg-2.2.15.ebuild b/media-video/ffmpeg/ffmpeg-2.2.15.ebuild
index d61135a71c0b..0ab0520c7f80 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.15.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild,v 1.1 2015/04/18 10:45:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild,v 1.2 2015/05/29 09:45:15 aballier Exp $
 
 EAPI="5"
 
@@ -326,9 +326,7 @@ multilib_src_configure() {
 		--cc="$(tc-getCC)" \
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
+		--optflags=" " \
 		$(use_enable static-libs static) \
 		"${myconf[@]}"
 	echo "${@}"
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index 48e28241a81a..db1413a40eb1 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.1 2015/05/18 13:45:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.2 2015/05/29 09:45:15 aballier Exp $
 
 EAPI="5"
 
@@ -403,9 +403,7 @@ multilib_src_configure() {
 		--cc="$(tc-getCC)" \
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
+		--optflags=" " \
 		$(use_enable static-libs static) \
 		"${myconf[@]}"
 	echo "${@}"
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index af52a78b8caf..ba1bf53f93df 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.189 2015/05/19 09:24:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.190 2015/05/29 09:45:15 aballier Exp $
 
 EAPI="5"
 
@@ -403,9 +403,7 @@ multilib_src_configure() {
 		--cc="$(tc-getCC)" \
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
+		--optflags=" " \
 		$(use_enable static-libs static) \
 		"${myconf[@]}"
 	echo "${@}"