aballier 15/05/29 09:45:15
Modified: ffmpeg-9999.ebuild ffmpeg-2.2.15.ebuild ChangeLog
ffmpeg-2.2.14.ebuild ffmpeg-2.6.3.ebuild
Log:
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 <aball...@gentoo.org>
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
160F534A)
Revision Changes Path
1.190 media-video/ffmpeg/ffmpeg-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.190&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.190&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.189&r2=1.190
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ffmpeg-9999.ebuild 19 May 2015 09:24:10 -0000 1.189
+++ ffmpeg-9999.ebuild 29 May 2015 09:45:15 -0000 1.190
@@ -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 @@
--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 "${@}"
1.2 media-video/ffmpeg/ffmpeg-2.2.15.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-2.2.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-2.2.15.ebuild 18 Apr 2015 10:45:51 -0000 1.1
+++ ffmpeg-2.2.15.ebuild 29 May 2015 09:45:15 -0000 1.2
@@ -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 @@
--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 "${@}"
1.861 media-video/ffmpeg/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.861&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.861&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.860&r2=1.861
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- ChangeLog 29 May 2015 09:22:34 -0000 1.860
+++ ChangeLog 29 May 2015 09:45:15 -0000 1.861
@@ -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 <aball...@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 <aball...@gentoo.org> -ffmpeg-2.6.1.ebuild,
-ffmpeg-2.6.2.ebuild:
1.8 media-video/ffmpeg/ffmpeg-2.2.14.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild?r1=1.7&r2=1.8
Index: ffmpeg-2.2.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ffmpeg-2.2.14.ebuild 29 May 2015 07:37:45 -0000 1.7
+++ ffmpeg-2.2.14.ebuild 29 May 2015 09:45:15 -0000 1.8
@@ -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 @@
--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 "${@}"
1.2 media-video/ffmpeg/ffmpeg-2.6.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-2.6.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-2.6.3.ebuild 18 May 2015 13:45:39 -0000 1.1
+++ ffmpeg-2.6.3.ebuild 29 May 2015 09:45:15 -0000 1.2
@@ -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 @@
--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 "${@}"
