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:18:00 +0100 |
commit | 55e24a4151fff5748002cb31e67a8fe2530137f3 (patch) | |
tree | ef3d79de4be47920659fa2f3f3d00d2755235d46 /meta/recipes-extended/lighttpd | |
parent | 244417def80c784753a2375dd914f437960fd4b5 (diff) | |
download | poky-55e24a4151fff5748002cb31e67a8fe2530137f3.tar.gz |
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>
Diffstat (limited to 'meta/recipes-extended/lighttpd')
-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 0000000000..42451b815c --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch fixes following issue with automake 1.12 | ||
4 | |||
5 | | configure.ac:42: error: automatic de-ANSI-fication support has been removed | ||
6 | ... | ||
7 | | automake: warnings are treated as errors | ||
8 | | /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 | ||
9 | | /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' | ||
10 | |||
11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | 2012/05/03 | ||
13 | |||
14 | Index: lighttpd-1.4.30/configure.ac | ||
15 | =================================================================== | ||
16 | --- lighttpd-1.4.30.orig/configure.ac | ||
17 | +++ lighttpd-1.4.30/configure.ac | ||
18 | @@ -24,6 +24,11 @@ dnl AC_PROG_CXX | ||
19 | AC_PROG_LN_S | ||
20 | AC_PROG_MAKE_SET | ||
21 | |||
22 | +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it | ||
23 | +m4_pattern_allow([AM_PROG_AR]) | ||
24 | +AM_PROG_AR | ||
25 | + | ||
26 | + | ||
27 | dnl check environment | ||
28 | AC_AIX | ||
29 | AC_ISC_POSIX | ||
30 | @@ -39,7 +44,6 @@ AM_CONDITIONAL(NO_RDYNAMIC, test x$NO_RD | ||
31 | AC_EXEEXT | ||
32 | |||
33 | dnl more automake stuff | ||
34 | -AM_C_PROTOTYPES | ||
35 | |||
36 | dnl libtool | ||
37 | 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 3ae38671f8..161c0d964f 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} += " \ | |||
16 | lighttpd-module-staticfile \ | 16 | lighttpd-module-staticfile \ |
17 | " | 17 | " |
18 | 18 | ||
19 | PR = "r0" | 19 | PR = "r1" |
20 | 20 | ||
21 | SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \ | 21 | SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \ |
22 | file://index.html.lighttpd \ | 22 | file://index.html.lighttpd \ |
23 | file://lighttpd.conf \ | 23 | file://lighttpd.conf \ |
24 | file://lighttpd \ | 24 | file://lighttpd \ |
25 | " | 25 | file://lighttpd_fix_for_automake-1.12.patch \ |
26 | " | ||
26 | 27 | ||
27 | SRC_URI[md5sum] = "63f9df52dcae0ab5689a95c99c54e48a" | 28 | SRC_URI[md5sum] = "63f9df52dcae0ab5689a95c99c54e48a" |
28 | SRC_URI[sha256sum] = "0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d" | 29 | SRC_URI[sha256sum] = "0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d" |