lame: fix build with automake 1.12.x
automake 1.12.x has deprecated automatic de-ANSI-fication support. Fix sources to work with automake 1.12.x Added a new patch: lame-3.99.5_fix_for_automake-1.12.x.patch (From OE-Core rev: 84a433e383e7b2e96932739c31b25956ad8dfc54) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
20a04e39b7
commit
cac24abd04
|
@ -0,0 +1,59 @@
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Fix this kind of errors with automake 1.12.x:
|
||||||
|
| doc/man/Makefile.am:3: error: automatic de-ANSI-fication support has been removed
|
||||||
|
| autoreconf: automake failed with exit status: 1
|
||||||
|
|
||||||
|
Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||||
|
2012/07/13
|
||||||
|
|
||||||
|
Index: lame-3.99.5/configure.in
|
||||||
|
===================================================================
|
||||||
|
--- lame-3.99.5.orig/configure.in
|
||||||
|
+++ lame-3.99.5/configure.in
|
||||||
|
@@ -77,9 +77,6 @@ if test "${GCC}" = "yes"; then
|
||||||
|
AC_MSG_RESULT(${GCC_version})
|
||||||
|
fi
|
||||||
|
|
||||||
|
-dnl more automake stuff
|
||||||
|
-AM_C_PROTOTYPES
|
||||||
|
-
|
||||||
|
AC_CHECK_HEADER(dmalloc.h)
|
||||||
|
if test "${ac_cv_header_dmalloc_h}" = "yes"; then
|
||||||
|
AM_WITH_DMALLOC
|
||||||
|
Index: lame-3.99.5/doc/html/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lame-3.99.5.orig/doc/html/Makefile.am
|
||||||
|
+++ lame-3.99.5/doc/html/Makefile.am
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
|
||||||
|
|
||||||
|
-AUTOMAKE_OPTIONS = foreign ansi2knr
|
||||||
|
+AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
|
docdir = $(datadir)/doc
|
||||||
|
pkgdocdir = $(docdir)/$(PACKAGE)
|
||||||
|
Index: lame-3.99.5/libmp3lame/i386/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lame-3.99.5.orig/libmp3lame/i386/Makefile.am
|
||||||
|
+++ lame-3.99.5/libmp3lame/i386/Makefile.am
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
|
||||||
|
|
||||||
|
-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
|
||||||
|
+AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
|
DEFS = @DEFS@ @CONFIG_DEFS@
|
||||||
|
|
||||||
|
Index: lame-3.99.5/doc/man/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lame-3.99.5.orig/doc/man/Makefile.am
|
||||||
|
+++ lame-3.99.5/doc/man/Makefile.am
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
|
||||||
|
|
||||||
|
-AUTOMAKE_OPTIONS = foreign ansi2knr
|
||||||
|
+AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
|
man_MANS = lame.1
|
||||||
|
EXTRA_DIST = ${man_MANS}
|
|
@ -8,10 +8,11 @@ LICENSE_FLAGS = "commercial"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
|
LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
|
||||||
file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \
|
file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \
|
||||||
"
|
"
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
|
SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
|
||||||
file://no-gtk1.patch"
|
file://no-gtk1.patch \
|
||||||
|
file://lame-3.99.5_fix_for_automake-1.12.x.patch "
|
||||||
|
|
||||||
SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce"
|
SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce"
|
||||||
SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
|
SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
|
||||||
|
@ -23,12 +24,3 @@ FILES_${PN} = "${bindir}/lame"
|
||||||
FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
|
FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
|
||||||
FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
|
FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
|
||||||
FILES_${PN}-dev = ""
|
FILES_${PN}-dev = ""
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
# no autoreconf please
|
|
||||||
aclocal
|
|
||||||
autoconf
|
|
||||||
libtoolize --force
|
|
||||||
gnu-configize --force
|
|
||||||
oe_runconf
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue