summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-24 09:30:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-24 09:30:02 +0000
commit53c34d9642fb96b2d6dccb6988004046688994b2 (patch)
tree02f4809a2dbb07b00928e9c4a90da876b5824113 /media-sound/timidity++/files
parentuse profile && filter-flags -fomit-frame-pointer (diff)
downloadgentoo-2-53c34d9642fb96b2d6dccb6988004046688994b2.tar.gz
gentoo-2-53c34d9642fb96b2d6dccb6988004046688994b2.tar.bz2
gentoo-2-53c34d9642fb96b2d6dccb6988004046688994b2.zip
Fix the patch once more, thanks to aballier.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/timidity++/files')
-rw-r--r--media-sound/timidity++/files/timidity++-2.13.2-params.patch17
1 files changed, 12 insertions, 5 deletions
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-params.patch b/media-sound/timidity++/files/timidity++-2.13.2-params.patch
index 68aa9710745e..028805591a1d 100644
--- a/media-sound/timidity++/files/timidity++-2.13.2-params.patch
+++ b/media-sound/timidity++/files/timidity++-2.13.2-params.patch
@@ -31,12 +31,19 @@ diff -ur TiMidity++-2.13.2.orig/autoconf/vorbis.m4 TiMidity++-2.13.2/autoconf/vo
dnl
diff -ur TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
--- TiMidity++-2.13.2.orig/configure.in 2004-10-03 15:39:52.000000000 +0300
-+++ TiMidity++-2.13.2/configure.in 2009-07-24 11:48:33.000000000 +0300
-@@ -1927,7 +1927,6 @@
++++ TiMidity++-2.13.2/configure.in 2009-07-24 12:26:04.000000000 +0300
+@@ -1925,10 +1925,10 @@
- SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
- SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
+ AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
+
+-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
+-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
- SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
+-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
++LDFLAGS="$LDFLAGS"
++SHLDFLAGS="$SHLDFLAGS"
++CFLAGS="$EXTRACFLAGS $CFLAGS"
++CPPFLAGS="$CPPFLAGS $EXTRADEFS"
if test "x$oss_device" != x; then
+ AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)