diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-04-29 01:40:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-04-29 01:40:40 +0000 |
| commit | ae81d4d1e45652434041bb2e17a4c6156720a004 (patch) | |
| tree | 682beaa1dc3cbb9ff308742966f81a4f504843c4 /media-sound | |
| parent | Tweak style to make it easier to maintain. (diff) | |
| download | gentoo-2-ae81d4d1e45652434041bb2e17a4c6156720a004.tar.gz gentoo-2-ae81d4d1e45652434041bb2e17a4c6156720a004.tar.bz2 gentoo-2-ae81d4d1e45652434041bb2e17a4c6156720a004.zip | |
Fix AR handling #468176 by Agostino Sarubbo.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/timidity++/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/timidity++/files/timidity++-2.14.0-ar.patch | 23 | ||||
| -rw-r--r-- | media-sound/timidity++/timidity++-2.14.0-r1.ebuild | 5 |
3 files changed, 31 insertions, 3 deletions
diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog index 40bb8192f1a0..d238e486937b 100644 --- a/media-sound/timidity++/ChangeLog +++ b/media-sound/timidity++/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/timidity++ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.158 2014/04/29 01:34:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.159 2014/04/29 01:40:40 vapier Exp $ + + 29 Apr 2014; Mike Frysinger <vapier@gentoo.org> + +files/timidity++-2.14.0-ar.patch, timidity++-2.14.0-r1.ebuild: + Fix AR handling #468176 by Agostino Sarubbo. 29 Apr 2014; Mike Frysinger <vapier@gentoo.org> timidity++-2.14.0-r1.ebuild: Tweak style to make it easier to maintain. diff --git a/media-sound/timidity++/files/timidity++-2.14.0-ar.patch b/media-sound/timidity++/files/timidity++-2.14.0-ar.patch new file mode 100644 index 000000000000..5c58cfcb89f3 --- /dev/null +++ b/media-sound/timidity++/files/timidity++-2.14.0-ar.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/468176 + +--- a/configure.in ++++ b/configure.in +@@ -167,6 +167,7 @@ AC_PROG_CC + AC_PROG_GCC_TRADITIONAL + AC_PROG_INSTALL + AC_PROG_AWK ++AC_CHECK_TOOL([AR], [ar], :) + AC_PROG_RANLIB + AC_PROG_LN_S + CHECK_COMPILER_OPTION(rdynamic) +--- a/timidity/Makefile.am ++++ b/timidity/Makefile.am +@@ -417,7 +417,7 @@ calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) + $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS) + timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) + @rm -f timidity$(EXEEXT) +- ar -cru timidity.exe $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) ++ $(AR) -cru timidity.exe $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) + else + calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) + @rm -f calcnewt$(EXEEXT) diff --git a/media-sound/timidity++/timidity++-2.14.0-r1.ebuild b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild index a3a557defadf..1721e878a502 100644 --- a/media-sound/timidity++/timidity++-2.14.0-r1.ebuild +++ b/media-sound/timidity++/timidity++-2.14.0-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-sound/timidity++/timidity++-2.14.0-r1.ebuild,v 1.3 2014/04/29 01:34:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r1.ebuild,v 1.4 2014/04/29 01:40:40 vapier Exp $ EAPI=5 inherit autotools eutils elisp-common user systemd toolchain-funcs @@ -49,7 +49,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-params.patch \ "${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch \ - "${FILESDIR}"/${P}-tcltk86.patch + "${FILESDIR}"/${P}-tcltk86.patch \ + "${FILESDIR}"/${P}-ar.patch eautoreconf } |