lighttpd: fix build with automake 1.12

(From OE-Core rev: 7d0a1dd058ecf14e11e6d6e58ff156b9c6b43218)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble 2012-05-03 10:06:13 -07:00 committed by Richard Purdie
parent 244417def8
commit 55e24a4151
2 changed files with 40 additions and 2 deletions

View File

@ -0,0 +1,37 @@
Upstream-Status: Pending
This patch fixes following issue with automake 1.12
| configure.ac:42: error: automatic de-ANSI-fication support has been removed
...
| automake: warnings are treated as errors
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'liblightcomp.la': linking libtool libraries using a non-POSIX
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2012/05/03
Index: lighttpd-1.4.30/configure.ac
===================================================================
--- lighttpd-1.4.30.orig/configure.ac
+++ lighttpd-1.4.30/configure.ac
@@ -24,6 +24,11 @@ dnl AC_PROG_CXX
AC_PROG_LN_S
AC_PROG_MAKE_SET
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
+
dnl check environment
AC_AIX
AC_ISC_POSIX
@@ -39,7 +44,6 @@ AM_CONDITIONAL(NO_RDYNAMIC, test x$NO_RD
AC_EXEEXT
dnl more automake stuff
-AM_C_PROTOTYPES
dnl libtool
AC_DISABLE_STATIC

View File

@ -16,13 +16,14 @@ RDEPENDS_${PN} += " \
lighttpd-module-staticfile \
"
PR = "r0"
PR = "r1"
SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
file://index.html.lighttpd \
file://lighttpd.conf \
file://lighttpd \
"
file://lighttpd_fix_for_automake-1.12.patch \
"
SRC_URI[md5sum] = "63f9df52dcae0ab5689a95c99c54e48a"
SRC_URI[sha256sum] = "0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d"