summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-04-21 07:15:34 +0000
committerMike Frysinger <vapier@gentoo.org>2008-04-21 07:15:34 +0000
commit77f2dad8fb218c2918c99e57a56ce494eb8106bf (patch)
treebddddf3d17f18874e59c812680ee3a448e052c22 /media-libs/libsndfile
parentRe-add eutils. (diff)
downloadgentoo-2-77f2dad8fb218c2918c99e57a56ce494eb8106bf.tar.gz
gentoo-2-77f2dad8fb218c2918c99e57a56ce494eb8106bf.tar.bz2
gentoo-2-77f2dad8fb218c2918c99e57a56ce494eb8106bf.zip
Fixup errors in autotool code caught by libtool-2.2 #218666 by Lars (Polynomial-C).
(Portage version: 2.2_pre5)
Diffstat (limited to 'media-libs/libsndfile')
-rw-r--r--media-libs/libsndfile/ChangeLog9
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.17-autotools.patch15
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild6
3 files changed, 25 insertions, 5 deletions
diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index 80237cc69624..5c021f10776d 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/libsndfile
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.83 2008/04/14 13:54:54 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.84 2008/04/21 07:15:33 vapier Exp $
+
+ 21 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/libsndfile-1.0.17-autotools.patch, libsndfile-1.0.17-r1.ebuild:
+ Fixup errors in autotool code caught by libtool-2.2 #218666 by Lars
+ (Polynomial-C).
14 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
libsndfile-1.0.17-r1.ebuild:
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.17-autotools.patch b/media-libs/libsndfile/files/libsndfile-1.0.17-autotools.patch
new file mode 100644
index 000000000000..85da38fad04e
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.17-autotools.patch
@@ -0,0 +1,15 @@
+we use the functions provided by these macros, so make sure we call them
+
+http://bugs.gentoo.org/218666
+
+--- configure.ac
++++ configure.ac
+@@ -31,6 +31,8 @@
+ SHARED_VERSION_INFO="1:17:0"
+
+ AC_PROG_CC
++AM_PROG_CC_C_O
++AC_PROG_CXX
+ AM_PROG_LIBTOOL
+
+ AC_CHECK_PROG(autogen, autogen, yes, no)
diff --git a/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild
index 58e3f4006666..e92f1e3f3a82 100644
--- a/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild,v 1.13 2008/04/14 13:54:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild,v 1.14 2008/04/21 07:15:33 vapier Exp $
inherit eutils libtool autotools
@@ -31,10 +31,10 @@ src_unpack() {
epatch "${FILESDIR}/${P}-flac-buffer-overflow.patch"
epatch "${FILESDIR}/${P}-dontbuild-tests-examples.patch"
epatch "${FILESDIR}/${P}-regtests-need-sqlite.patch"
+ epatch "${FILESDIR}"/${P}-autotools.patch
# Fix for autoconf 2.62
- sed -i -e '/AC_MSG_WARN(\[\[/d' \
- "${S}/acinclude.m4"
+ sed -i -e '/AC_MSG_WARN(\[\[/d' acinclude.m4 || die
eautoreconf
epunt_cxx