sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Alexander Kanavin 2016-08-29 17:30:17 +03:00 committed by Richard Purdie
parent 16fae9fffe
commit 7bb1907287
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,37 @@
From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 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.
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(-)
diff --git a/configure.ac b/configure.ac
index 1d172a1..a9236da 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], [
+ 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
--
2.9.3

33
meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
View File

@ -1,33 +0,0 @@
Use pkg-config for pcre dependency instead of -config script.
Upstream-Status: Pending
RP 2014/5/22
Index: lighttpd-1.4.35/configure.ac
===================================================================
--- lighttpd-1.4.35.orig/configure.ac 2014-03-06 14:08:00.000000000 +0000
+++ lighttpd-1.4.35/configure.ac 2014-05-13 16:58:30.758471169 +0000
@@ -309,16 +309,14 @@
AC_MSG_RESULT([$WITH_PCRE])
if test "$WITH_PCRE" != "no"; then
- AC_PATH_PROG(PCRECONFIG, pcre-config)
-
- if test x"$PCRECONFIG" != x; then
- PCRE_LIB=`$PCRECONFIG --libs`
- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
+ PCRE_LIB=${PCREPKG_LIBS}
+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
- else
+ ], [
AC_MSG_ERROR([pcre-config not found, install the pcre-devel package or build with --without-pcre])
- fi
+ ])
fi
AC_SUBST(PCRE_LIB)

6
meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb → meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
View File

@ -20,11 +20,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://lighttpd.conf \
file://lighttpd \
file://lighttpd.service \
file://pkgconfig.patch \
file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
"
SRC_URI[md5sum] = "63c7563be1c7a7a9819a51f07f1af8b2"
SRC_URI[sha256sum] = "7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b"
SRC_URI[md5sum] = "1df2e4dbc965cfe6f99f008ac3db4d8d"
SRC_URI[sha256sum] = "4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c"
PACKAGECONFIG ??= "openssl"
PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"