mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

lighttpd: update to 1.4.48

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2017-11-15 12:20:58 +02:00
committed by Richard Purdie
parent 91972d58c9
commit c4f285e59e
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
View File

@@ -1,4 +1,4 @@
From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 26 Aug 2016 18:20:32 +0300
Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
@@ -7,31 +7,36 @@ RP 2014/5/22
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
configure.ac | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
configure.ac | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1d172a1..a9236da 100644
index 5383cec..c29a902 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then
PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
else
- AC_PATH_PROG(PCRECONFIG, pcre-config)
- if test x"$PCRECONFIG" != x; then
- PCRE_LIB=`$PCRECONFIG --libs`
- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
- fi
+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
)
AC_MSG_RESULT([$WITH_PCRE])
-if test "$WITH_PCRE" != no; then
- if test "$WITH_PCRE" != yes; then
- PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
+if test "$WITH_PCRE" != "no"; then
+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
+ PCRE_LIB=${PCREPKG_LIBS}
+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
+ ], [
+ ], [
+ AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
+ ])
fi
if test x"$PCRE_LIB" != x; then
+ ])
+
+ if test x"$PCRE_LIB" != x; then
+ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
+ AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
+ AC_SUBST(PCRE_LIB)
else
AC_PATH_PROG([PCRECONFIG], [pcre-config])
if test -n "$PCRECONFIG"; then
--
2.9.3
2.15.0

4
meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb → meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
View File

@@ -20,8 +20,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
"
SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631"
SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f"
SRC_URI[md5sum] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8"
SRC_URI[sha256sum] = "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36"
PACKAGECONFIG ??= "openssl pcre zlib \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \