summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-08-29 17:30:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:38 +0100
commit7bb190728788116533a27594e29c2355c8cf364c (patch)
tree292946bc6c267c03959623cfce52f6ed09a53925 /meta
parent16fae9fffe203cb67e965e2688be2c21b74dbfdd (diff)
downloadpoky-7bb190728788116533a27594e29c2355c8cf364c.tar.gz
lighttpd: update to 1.4.41
Rebase pkgconfig.patch (From OE-Core rev: 45fac4161cb230bc03c6c08d21cc768e52700f02) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch37
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch33
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb)6
3 files changed, 40 insertions, 36 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
new file mode 100644
index 0000000000..b8c7f37514
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
@@ -0,0 +1,37 @@
1From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 26 Aug 2016 18:20:32 +0300
4Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
5
6RP 2014/5/22
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 configure.ac | 11 ++++++-----
11 1 file changed, 6 insertions(+), 5 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 1d172a1..a9236da 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then
18 PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
19 CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
20 else
21- AC_PATH_PROG(PCRECONFIG, pcre-config)
22- if test x"$PCRECONFIG" != x; then
23- PCRE_LIB=`$PCRECONFIG --libs`
24- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
25- fi
26+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
27+ PCRE_LIB=${PCREPKG_LIBS}
28+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
29+ ], [
30+ AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
31+ ])
32 fi
33
34 if test x"$PCRE_LIB" != x; then
35--
362.9.3
37
diff --git a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
deleted file mode 100644
index e395f928ce..0000000000
--- a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Use pkg-config for pcre dependency instead of -config script.
2
3Upstream-Status: Pending
4
5RP 2014/5/22
6
7
8Index: lighttpd-1.4.35/configure.ac
9===================================================================
10--- lighttpd-1.4.35.orig/configure.ac 2014-03-06 14:08:00.000000000 +0000
11+++ lighttpd-1.4.35/configure.ac 2014-05-13 16:58:30.758471169 +0000
12@@ -309,16 +309,14 @@
13 AC_MSG_RESULT([$WITH_PCRE])
14
15 if test "$WITH_PCRE" != "no"; then
16- AC_PATH_PROG(PCRECONFIG, pcre-config)
17-
18- if test x"$PCRECONFIG" != x; then
19- PCRE_LIB=`$PCRECONFIG --libs`
20- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
21+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
22+ PCRE_LIB=${PCREPKG_LIBS}
23+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
24 AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
25 AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
26- else
27+ ], [
28 AC_MSG_ERROR([pcre-config not found, install the pcre-devel package or build with --without-pcre])
29- fi
30+ ])
31 fi
32
33 AC_SUBST(PCRE_LIB)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
index 378accbf11..a74d3a15b7 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
@@ -20,11 +20,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
20 file://lighttpd.conf \ 20 file://lighttpd.conf \
21 file://lighttpd \ 21 file://lighttpd \
22 file://lighttpd.service \ 22 file://lighttpd.service \
23 file://pkgconfig.patch \ 23 file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
24 " 24 "
25 25
26SRC_URI[md5sum] = "63c7563be1c7a7a9819a51f07f1af8b2" 26SRC_URI[md5sum] = "1df2e4dbc965cfe6f99f008ac3db4d8d"
27SRC_URI[sha256sum] = "7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b" 27SRC_URI[sha256sum] = "4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c"
28 28
29PACKAGECONFIG ??= "openssl" 29PACKAGECONFIG ??= "openssl"
30PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" 30PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"