diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2014-11-28 14:01:35 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2014-11-28 14:01:35 +0000 |
| commit | c298b61799473c6ec9825788da301ea5d20c8802 (patch) | |
| tree | c29eeed8872e8f235a48f6bca7e09b8e7ba2b457 /media-libs | |
| parent | Support python 3.4 (diff) | |
| download | gentoo-2-c298b61799473c6ec9825788da301ea5d20c8802.tar.gz gentoo-2-c298b61799473c6ec9825788da301ea5d20c8802.tar.bz2 gentoo-2-c298b61799473c6ec9825788da301ea5d20c8802.zip | |
Respect CFLAGS (fixes bug #530920).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/flac/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.3.1-cflags.patch | 23 | ||||
| -rw-r--r-- | media-libs/flac/flac-1.3.1-r1.ebuild (renamed from media-libs/flac/flac-1.3.1.ebuild) | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog index 4866470a6acb..813b5d7a7a85 100644 --- a/media-libs/flac/ChangeLog +++ b/media-libs/flac/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/flac # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.181 2014/11/27 14:54:38 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.182 2014/11/28 14:01:35 radhermit Exp $ + +*flac-1.3.1-r1 (28 Nov 2014) + + 28 Nov 2014; Tim Harder <radhermit@gentoo.org> -flac-1.3.1.ebuild, + +flac-1.3.1-r1.ebuild, +files/flac-1.3.1-cflags.patch: + Respect CFLAGS (fixes bug #530920). 27 Nov 2014; Tim Harder <radhermit@gentoo.org> flac-1.3.1.ebuild: 3dnow support was removed in this release. diff --git a/media-libs/flac/files/flac-1.3.1-cflags.patch b/media-libs/flac/files/flac-1.3.1-cflags.patch new file mode 100644 index 000000000000..758e7b31c13a --- /dev/null +++ b/media-libs/flac/files/flac-1.3.1-cflags.patch @@ -0,0 +1,23 @@ +--- flac-1.3.1/configure.ac ++++ flac-1.3.1/configure.ac +@@ -348,12 +348,8 @@ + + if test "x$debug" = xtrue; then + CPPFLAGS="-DDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') +- CFLAGS="-g $CFLAGS" + else + CPPFLAGS="-DNDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') +- CFLAGS="-O3 -funroll-loops $CFLAGS" + fi + + XIPH_GCC_VERSION +@@ -363,7 +359,6 @@ + CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + + XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) +- XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) + + AC_LANG_PUSH([C++]) + XIPH_ADD_CXXFLAGS([-Weffc++]) diff --git a/media-libs/flac/flac-1.3.1.ebuild b/media-libs/flac/flac-1.3.1-r1.ebuild index 207bba0aa503..803e24d13158 100644 --- a/media-libs/flac/flac-1.3.1.ebuild +++ b/media-libs/flac/flac-1.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.1.ebuild,v 1.2 2014/11/27 14:54:38 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.1-r1.ebuild,v 1.1 2014/11/28 14:01:35 radhermit Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -30,6 +30,7 @@ DEPEND="${RDEPEND} src_prepare() { local PATCHES=( + "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${PN}-1.3.0-asneeded.patch "${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch "${FILESDIR}"/${PN}-1.3.0-dontbuild-examples.patch |