summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2009-02-19 07:53:06 +0000
committerPatrick Lauer <patrick@gentoo.org>2009-02-19 07:53:06 +0000
commit1ccc6886970274b3b00843a07684ec6d0ffd9030 (patch)
tree8f73ed0e8d30677fb3025126d285a55e60585fab
parentversion bump (diff)
downloadgentoo-2-1ccc6886970274b3b00843a07684ec6d0ffd9030.tar.gz
gentoo-2-1ccc6886970274b3b00843a07684ec6d0ffd9030.tar.bz2
gentoo-2-1ccc6886970274b3b00843a07684ec6d0ffd9030.zip
Fixing bad CFLAG filtering by upstream. Patch by Martin von Gagern. Fixes #257489
(Portage version: 2.2_rc23/cvs/Linux x86_64)
-rw-r--r--media-sound/audacity/ChangeLog7
-rw-r--r--media-sound/audacity/audacity-1.3.7.ebuild3
-rw-r--r--media-sound/audacity/files/audacity-1.3.7-cflags.patch38
3 files changed, 46 insertions, 2 deletions
diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index ff6bea3f4be2..6ee96af8d311 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/audacity
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.119 2009/02/18 16:38:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.120 2009/02/19 07:53:06 patrick Exp $
+
+ 19 Feb 2009; Patrick Lauer <patrick@gentoo.org>
+ +files/audacity-1.3.7-cflags.patch:
+ Fixing bad CFLAG filtering by upstream. Patch by Martin von Gagern. Fixes
+ #257489
18 Feb 2009; Raúl Porcel <armin76@gentoo.org> audacity-1.3.6.ebuild:
sparc stable wrt #253493
diff --git a/media-sound/audacity/audacity-1.3.7.ebuild b/media-sound/audacity/audacity-1.3.7.ebuild
index 2c6236f4b49a..fdb762d82fc9 100644
--- a/media-sound/audacity/audacity-1.3.7.ebuild
+++ b/media-sound/audacity/audacity-1.3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.7.ebuild,v 1.2 2009/02/13 07:20:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.7.ebuild,v 1.3 2009/02/19 07:53:06 patrick Exp $
EAPI=2
@@ -53,6 +53,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${PN}-1.3.4-automagic.patch"
epatch "${FILESDIR}/${PN}-1.3.5-libtool22.patch"
+ epatch "${FILESDIR}/${P}-cflags.patch"
AT_M4DIR="${S}/m4" eautoreconf
}
diff --git a/media-sound/audacity/files/audacity-1.3.7-cflags.patch b/media-sound/audacity/files/audacity-1.3.7-cflags.patch
new file mode 100644
index 000000000000..cdd9425e78b6
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.7-cflags.patch
@@ -0,0 +1,38 @@
+Index: audacity-src-1.3.7/lib-src/sbsms/configure.in
+===================================================================
+--- audacity-src-1.3.7.orig/lib-src/sbsms/configure.in
++++ audacity-src-1.3.7/lib-src/sbsms/configure.in
+@@ -123,14 +123,6 @@ else
+ fi
+ AM_CONDITIONAL(ENABLE_PORTAUDIO, test x$enable_portaudio = xyes)
+
+-CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"`
+-
+-if test x$enable_debug = xyes; then
+- CXXFLAGS="$CXXFLAGS -g -O0"
+-else
+- CXXFLAGS="$CXXFLAGS -O3 -fomit-frame-pointer"
+-fi
+-
+ if test x$enable_static = xyes; then
+ CXXFLAGS="$CXXFLAGS"
+ else
+Index: audacity-src-1.3.7/lib-src/sbsms/configure
+===================================================================
+--- audacity-src-1.3.7.orig/lib-src/sbsms/configure
++++ audacity-src-1.3.7/lib-src/sbsms/configure
+@@ -15359,14 +15359,6 @@ else
+ fi
+
+
+-CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"`
+-
+-if test x$enable_debug = xyes; then
+- CXXFLAGS="$CXXFLAGS -g -O0"
+-else
+- CXXFLAGS="$CXXFLAGS -O3 -fomit-frame-pointer"
+-fi
+-
+ if test x$enable_static = xyes; then
+ CXXFLAGS="$CXXFLAGS"
+ else