diff options
| author |   Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-03 10:06:13 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:17:38 +0100 |
| commit | 7d0a1dd058ecf14e11e6d6e58ff156b9c6b43218 (patch) | |
| tree | 7ed404ab4910c85c8584b28352331f4fb59e28d4 | |
| parent | 8046c8285152e854e3d4fc47199bb65dbca8002e (diff) | |
| download | openembedded-core-contrib-7d0a1dd058ecf14e11e6d6e58ff156b9c6b43218.tar.gz | |
lighttpd: fix build with automake 1.12
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
| -rw-r--r-- | meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb | 5 |
2 files changed, 40 insertions, 2 deletions
diff --git a/meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch b/meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch new file mode 100644 index 00000000000..42451b815ce --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch @@ -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 diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb index 3ae38671f89..161c0d964f5 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb @@ -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" |