diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-07 21:05:42 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-07 21:05:42 +0000 |
| commit | f610cc71b15a418c1347bcabc041abee54bc8cdc (patch) | |
| tree | ab34530dfffc5ad4eeceb34a0e483863c5e74b8e /media-libs/libsndfile | |
| parent | 2.2.0_alpha195 version bump. This includes all of the fixes in 2.1.13.6. (diff) | |
| download | gentoo-2-f610cc71b15a418c1347bcabc041abee54bc8cdc.tar.gz gentoo-2-f610cc71b15a418c1347bcabc041abee54bc8cdc.tar.bz2 gentoo-2-f610cc71b15a418c1347bcabc041abee54bc8cdc.zip | |
Fix build on fbsd by honouring the MAKE variable.
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/libsndfile')
| -rw-r--r-- | media-libs/libsndfile/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsndfile/files/libsndfile-1.0.25-make.patch | 14 | ||||
| -rw-r--r-- | media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog index 7661f3017dd6..1f127f59c71e 100644 --- a/media-libs/libsndfile/ChangeLog +++ b/media-libs/libsndfile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsndfile # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.136 2013/07/29 22:05:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.137 2013/08/07 21:05:42 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> + libsndfile-1.0.25-r1.ebuild, +files/libsndfile-1.0.25-make.patch: + Fix build on fbsd by honouring the MAKE variable. 29 Jul 2013; Alexis Ballier <aballier@gentoo.org> libsndfile-1.0.25-r1.ebuild: diff --git a/media-libs/libsndfile/files/libsndfile-1.0.25-make.patch b/media-libs/libsndfile/files/libsndfile-1.0.25-make.patch new file mode 100644 index 000000000000..70cc4e2e4b4b --- /dev/null +++ b/media-libs/libsndfile/files/libsndfile-1.0.25-make.patch @@ -0,0 +1,14 @@ +Honour MAKE variable for systems with make != GNU make (eg fbsd) + +Index: libsndfile-1.0.25/configure.ac +=================================================================== +--- libsndfile-1.0.25.orig/configure.ac ++++ libsndfile-1.0.25/configure.ac +@@ -701,5 +701,5 @@ if test x$prefix != "x/usr" ; then + echo + fi + +-(cd src && make genfiles) +-(cd tests && make genfiles) ++(cd src && ${MAKE-make} genfiles) ++(cd tests && ${MAKE-make} genfiles) diff --git a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild index 05ecb84de2bd..c12dc419e012 100644 --- a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild +++ b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.2 2013/07/29 22:05:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.3 2013/08/07 21:05:42 aballier Exp $ EAPI=5 @@ -46,6 +46,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch + "${FILESDIR}"/${PN}-1.0.25-make.patch ) AT_M4DIR=M4 \ |