summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-20 22:38:07 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-20 22:38:07 +0000
commitedb3c36c62adbc75556a311cc254c0aea05328d0 (patch)
tree29555ba6f1f80a1b141509cf68b14c269ecc00da /media-sound/rezound
parentFix SRC_URI. Bug #333707 (diff)
downloadgentoo-2-edb3c36c62adbc75556a311cc254c0aea05328d0.tar.gz
gentoo-2-edb3c36c62adbc75556a311cc254c0aea05328d0.tar.bz2
gentoo-2-edb3c36c62adbc75556a311cc254c0aea05328d0.zip
Fix sys-devel/m4 loop wrt #305305, thanks to Mike Frysinger for his extensive analysis.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/rezound')
-rw-r--r--media-sound/rezound/ChangeLog9
-rw-r--r--media-sound/rezound/files/rezound-0.12.3_beta-m4.patch21
-rw-r--r--media-sound/rezound/rezound-0.12.3_beta-r2.ebuild7
3 files changed, 32 insertions, 5 deletions
diff --git a/media-sound/rezound/ChangeLog b/media-sound/rezound/ChangeLog
index 4b19b1650fcb..23ea8b6b5050 100644
--- a/media-sound/rezound/ChangeLog
+++ b/media-sound/rezound/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/rezound
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.58 2009/07/12 18:53:36 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.59 2010/08/20 22:38:07 ssuominen Exp $
+
+ 20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+ rezound-0.12.3_beta-r2.ebuild, +files/rezound-0.12.3_beta-m4.patch:
+ Fix sys-devel/m4 loop wrt #305305, thanks to Mike Frysinger for his
+ extensive analysis.
12 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
rezound-0.12.3_beta-r2.ebuild, +files/rezound-0.12.3_beta-gcc44.patch:
diff --git a/media-sound/rezound/files/rezound-0.12.3_beta-m4.patch b/media-sound/rezound/files/rezound-0.12.3_beta-m4.patch
new file mode 100644
index 000000000000..526fd241db35
--- /dev/null
+++ b/media-sound/rezound/files/rezound-0.12.3_beta-m4.patch
@@ -0,0 +1,21 @@
+ajv_CXX_FLAG macro is broken and causes m4 to loop forever, let's just assume g++ supports
+these flags, see http://bugs.gentoo.org/305305
+
+--- configure.ac
++++ configure.ac
+@@ -81,13 +81,9 @@
+
+
+ ############################################################################
+-# Set some compilter flags if they're available #
++# Set some compilter flags #
+ ############################################################################
+-ajv_CXX_FLAG(-g)
+-ajv_CXX_FLAG(-Wall)
+-ajv_CXX_FLAG(-Wno-unused-function)
+-ajv_CXX_FLAG(-Wno-unused-variable)
+-ajv_CXX_FLAG(-Wno-unused)
++CXXFLAGS="$CXXFLAGS -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused"
+
+
+
diff --git a/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild b/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
index 5a4f3b4e3658..1eb0bb32a711 100644
--- a/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
+++ b/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild,v 1.3 2009/07/12 18:53:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild,v 1.4 2010/08/20 22:38:07 ssuominen Exp $
EAPI=2
MY_P=${P/_/}
@@ -39,7 +39,8 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}"/${P}-gcc44.patch
+ epatch "${FILESDIR}"/${P}-gcc44.patch \
+ "${FILESDIR}"/${P}-m4.patch
AT_M4DIR="config/m4" eautoreconf
}