diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-02-09 18:27:38 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-02-09 18:27:38 +0000 |
| commit | 1011fdeeec8935c118969507b4e67bab2f6434d1 (patch) | |
| tree | 4913fb80aefca3ed8d1719666d370eaf0d91b89c /media-libs/libmikmod | |
| parent | Allow user patches through epatch_user (diff) | |
| download | gentoo-2-1011fdeeec8935c118969507b4e67bab2f6434d1.tar.gz gentoo-2-1011fdeeec8935c118969507b4e67bab2f6434d1.tar.bz2 gentoo-2-1011fdeeec8935c118969507b4e67bab2f6434d1.zip | |
Fix libmikmod.so installation caused by Makefile.am change. Fixes bug #402771 by Torsten Kaiser.
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libmikmod')
| -rw-r--r-- | media-libs/libmikmod/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch | 18 | ||||
| -rw-r--r-- | media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild (renamed from media-libs/libmikmod/libmikmod-3.2.0_beta2-r4.ebuild) | 9 |
3 files changed, 30 insertions, 7 deletions
diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog index ac6f2d57e64b..07c078ec0046 100644 --- a/media-libs/libmikmod/ChangeLog +++ b/media-libs/libmikmod/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/libmikmod # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.81 2012/02/08 14:46:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.82 2012/02/09 18:27:38 slyfox Exp $ + +*libmikmod-3.2.0_beta2-r5 (09 Feb 2012) + + 09 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/libmikmod-3.2.0_beta2-shell.patch, +libmikmod-3.2.0_beta2-r5.ebuild, + -libmikmod-3.2.0_beta2-r4.ebuild: + Fix libmikmod.so installation caused by Makefile.am change. Fixes bug #402771 + by Torsten Kaiser. 08 Feb 2012; Jeroen Roovers <jer@gentoo.org> libmikmod-3.2.0_beta2-r3.ebuild: Stable for HPPA (bug #335892). diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch new file mode 100644 index 000000000000..a5aa1157266a --- /dev/null +++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch @@ -0,0 +1,18 @@ +Upstream didn't ship Makefile.am so we have to patch bits by hands. +$(SHELL) is needed to run libtool properly (contains bashisms). +LIBTOOL variable uses $(SHELL) in it's definition. + +Gentoo-bug: http://bugs.gentoo.org/401329 +Reported by: Anthony Parsons +diff --git a/libmikmod/Makefile.in b/libmikmod/Makefile.in +index c0638de..070134a 100644 +--- a/libmikmod/Makefile.in ++++ b/libmikmod/Makefile.in +@@ -27,6 +27,7 @@ CC=@CC@ + INSTALL=@INSTALL@ + LIBTOOL=@LIBTOOL@ + MKINSTALLDIRS=${top_srcdir}/mkinstalldirs ++SHELL=@SHELL@ + + DEFS=@DEFS@ + CFLAGS=@CFLAGS@ -Dunix diff --git a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r4.ebuild b/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild index cee9340dbaf4..ffc3a86298f4 100644 --- a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r4.ebuild +++ b/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.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-libs/libmikmod/libmikmod-3.2.0_beta2-r4.ebuild,v 1.2 2012/02/08 06:50:52 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild,v 1.1 2012/02/09 18:27:38 slyfox Exp $ EAPI=2 MY_P=${P/_/-} @@ -30,11 +30,8 @@ src_prepare() { "${FILESDIR}"/${P}-fix-unload-crash.patch \ "${FILESDIR}"/${P}-CVE-2009-3995-3996.patch \ "${FILESDIR}"/${P}-CVE-2010-2546-2971.patch \ - "${FILESDIR}"/${P}-pa-workaround.patch - - # forge automake regenerate that ancient Makefile.in - # by creating empty Makefile.am. Fixes bug #401329 - touch libmikmod/Makefile.am + "${FILESDIR}"/${P}-pa-workaround.patch \ + "${FILESDIR}"/${P}-shell.patch AT_M4DIR=${S} eautoreconf } |