summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-15 12:20:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-30 10:49:21 +0000
commitc4f285e59e80f6dd6afdbc5797f0743b343266c7 (patch)
treedf89768a4452df3626e48fd31c185d517a041a32
parent91972d58c9fc40cc1d7e568d2457936257f79b45 (diff)
downloadpoky-c4f285e59e80f6dd6afdbc5797f0743b343266c7.tar.gz
lighttpd: update to 1.4.48
Refresh the pcre pkg-config patch. (From OE-Core rev: 01ff1c5929ef9293097da00b810ab94ceaf4a0dd) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch45
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb)4
2 files changed, 27 insertions, 22 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
index b8c7f37514..f17bdce2c0 100644
--- 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
@@ -1,4 +1,4 @@
1From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001 1From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 26 Aug 2016 18:20:32 +0300 3Date: Fri, 26 Aug 2016 18:20:32 +0300
4Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script. 4Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
@@ -7,31 +7,36 @@ RP 2014/5/22
7Upstream-Status: Pending 7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9--- 9---
10 configure.ac | 11 ++++++----- 10 configure.ac | 16 ++++++++++++----
11 1 file changed, 6 insertions(+), 5 deletions(-) 11 1 file changed, 12 insertions(+), 4 deletions(-)
12 12
13diff --git a/configure.ac b/configure.ac 13diff --git a/configure.ac b/configure.ac
14index 1d172a1..a9236da 100644 14index 5383cec..c29a902 100644
15--- a/configure.ac 15--- a/configure.ac
16+++ b/configure.ac 16+++ b/configure.ac
17@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then 17@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
18 PCRE_LIB="-L$WITH_PCRE/lib -lpcre" 18 )
19 CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include" 19 AC_MSG_RESULT([$WITH_PCRE])
20 else 20
21- AC_PATH_PROG(PCRECONFIG, pcre-config) 21-if test "$WITH_PCRE" != no; then
22- if test x"$PCRECONFIG" != x; then 22- if test "$WITH_PCRE" != yes; then
23- PCRE_LIB=`$PCRECONFIG --libs` 23- PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
24- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`" 24- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
25- fi 25+if test "$WITH_PCRE" != "no"; then
26+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [ 26+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
27+ PCRE_LIB=${PCREPKG_LIBS} 27+ PCRE_LIB=${PCREPKG_LIBS}
28+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}" 28+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
29+ ], [ 29+ ], [
30+ AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre]) 30+ AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
31+ ]) 31+ ])
32 fi 32+
33 33+ if test x"$PCRE_LIB" != x; then
34 if test x"$PCRE_LIB" != x; then 34+ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
35+ AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
36+ AC_SUBST(PCRE_LIB)
37 else
38 AC_PATH_PROG([PCRECONFIG], [pcre-config])
39 if test -n "$PCRECONFIG"; then
35-- 40--
362.9.3 412.15.0
37 42
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
index 08dda33606..3c4444cf42 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
@@ -20,8 +20,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
20 file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ 20 file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
21 " 21 "
22 22
23SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631" 23SRC_URI[md5sum] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8"
24SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f" 24SRC_URI[sha256sum] = "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36"
25 25
26PACKAGECONFIG ??= "openssl pcre zlib \ 26PACKAGECONFIG ??= "openssl pcre zlib \
27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \