Patchwork [4/5] lighttpd: upgrade to 1.4.32

login
register
mail settings
Submitter Constantin Musca
Date Dec. 4, 2012, 9:19 a.m.
Message ID <c3f94e922c52d16bdf0be2b777a249bbd96a1dea.1354611254.git.constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/40231/
State New
Headers show

Comments

Constantin Musca - Dec. 4, 2012, 9:19 a.m.
lighttpd_fix_for_automake-1.12.patch: removed
- included in the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../files/lighttpd_fix_for_automake-1.12.patch     | 37 ----------------------
 .../{lighttpd_1.4.31.bb => lighttpd_1.4.32.bb}     |  5 ++-
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.31.bb => lighttpd_1.4.32.bb} (90%)

Patch

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 42451b8..0000000
--- a/meta/recipes-extended/lighttpd/files/lighttpd_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-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.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
similarity index 90%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6856f53..df6ce97 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
         file://index.html.lighttpd \
         file://lighttpd.conf \
         file://lighttpd \
-        file://lighttpd_fix_for_automake-1.12.patch \
         "
 
-SRC_URI[md5sum] = "c718cc27658240d307b8a1d1c7c4bb54"
-SRC_URI[sha256sum] = "5209e7a25d3044cb21b34d6a2bb3a6f6c216ba903ea486a803d070582e5e26ac"
+SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
+SRC_URI[sha256sum] = "60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f"
 
 EXTRA_OECONF = " \
              --without-bzip2 \