summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lighttpd
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-03 17:11:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:10 +0000
commitefedbc4a8af9e8538244f60eaad631e827bc8654 (patch)
treeff37848843bb525ec70d0375654930b544013b31 /meta/recipes-extended/lighttpd
parentbce1cce5990cd064e6eaec859ff5e999bdf0959c (diff)
downloadpoky-efedbc4a8af9e8538244f60eaad631e827bc8654.tar.gz
lighttpd: upgrade to 1.4.32
lighttpd_fix_for_automake-1.12.patch: removed - included in the new version (From OE-Core rev: 6b87ac303c1f7357c9630359614b373082a59506) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.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.patch37
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb)5
2 files changed, 2 insertions, 40 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
deleted file mode 100644
index 42451b815c..0000000000
--- a/meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Pending
2
3This 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
11Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
122012/05/03
13
14Index: 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.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6856f538b5..df6ce9723d 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,11 +22,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
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 file://lighttpd_fix_for_automake-1.12.patch \
26 " 25 "
27 26
28SRC_URI[md5sum] = "c718cc27658240d307b8a1d1c7c4bb54" 27SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
29SRC_URI[sha256sum] = "5209e7a25d3044cb21b34d6a2bb3a6f6c216ba903ea486a803d070582e5e26ac" 28SRC_URI[sha256sum] = "60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f"
30 29
31EXTRA_OECONF = " \ 30EXTRA_OECONF = " \
32 --without-bzip2 \ 31 --without-bzip2 \