summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2012-12-07 14:27:31 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2012-12-07 14:27:31 +0000
commitae6bed35af82bc41d51a9ecda5a303948519ae4d (patch)
tree0a10dbc40e1f09814d47fde13d56cc9517a7271c /media-radio
parentStable for ppc, wrt bug #419767 (diff)
downloadgentoo-2-ae6bed35af82bc41d51a9ecda5a303948519ae4d.tar.gz
gentoo-2-ae6bed35af82bc41d51a9ecda5a303948519ae4d.tar.bz2
gentoo-2-ae6bed35af82bc41d51a9ecda5a303948519ae4d.zip
Do not filter duplicate CFLAGS (bug 411095). Thanks D.Dexter
(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'media-radio')
-rw-r--r--media-radio/xastir/ChangeLog6
-rw-r--r--media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff11
-rw-r--r--media-radio/xastir/xastir-2.0.0-r2.ebuild5
3 files changed, 20 insertions, 2 deletions
diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 34aecbd202f0..7b88bd9aee03 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-radio/xastir
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.28 2012/10/24 19:15:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.29 2012/12/07 14:27:31 tomjbe Exp $
+
+ 07 Dec 2012; Thomas Beierlein <tomjbe@gentoo.org> xastir-2.0.0-r2.ebuild,
+ +files/xastir-2.0.0-dont-filter-flags.diff:
+ Do not filter duplicate CFLAGS (bug 411095). Thanks D.Dexter
24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xastir-2.0.0-r1.ebuild,
xastir-2.0.0-r2.ebuild:
diff --git a/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff
new file mode 100644
index 000000000000..1fbea1d61a57
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff
@@ -0,0 +1,11 @@
+# Do not filter duplicate CFLAGS (bug 411095)
+--- configure.ac.orig 2012-12-07 15:12:43.000000000 +0100
++++ configure.ac 2012-12-07 15:13:08.000000000 +0100
+@@ -709,7 +709,6 @@
+ # "-llibrary" that needs it.
+ #
+ changequote(,)
+-CFLAGS=`echo "$CFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ CPPFLAGS=`echo "$CPPFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ LDFLAGS=`echo "$LDFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ #LIBS=`echo "$LIBS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
diff --git a/media-radio/xastir/xastir-2.0.0-r2.ebuild b/media-radio/xastir/xastir-2.0.0-r2.ebuild
index ee1ab40b2e3a..8a74bef9083c 100644
--- a/media-radio/xastir/xastir-2.0.0-r2.ebuild
+++ b/media-radio/xastir/xastir-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.7 2012/10/24 19:15:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.8 2012/12/07 14:27:31 tomjbe Exp $
EAPI=2
inherit autotools eutils
@@ -49,6 +49,9 @@ src_prepare() {
# instead build without shapelib support (bug #430704)
epatch "${FILESDIR}"/${P}-no-builtin-shapelib.diff
+ # do not filter duplicate flags (see bug 411095)
+ epatch "${FILESDIR}"/${P}-dont-filter-flags.diff
+
eautoreconf
}