summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lighttpd
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-12-04 08:13:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-06 11:09:52 +0000
commitcc5791aa4eec5a84ee37677fd68c2bcce10437bf (patch)
tree4044c6a599638b1283de3d93a2447a4a220151c6 /meta/recipes-extended/lighttpd
parent6778f069cacb1dc2a862f514d2a5fa40b39dad0a (diff)
downloadpoky-cc5791aa4eec5a84ee37677fd68c2bcce10437bf.tar.gz
lighttpd: remove unneeded (since meson switch) patch
(From OE-Core rev: cf6f8daf24c5c5bd2c7cde2dc4ecfefd79de61ee) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lighttpd')
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch42
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb1
2 files changed, 0 insertions, 43 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
deleted file mode 100644
index f17bdce2c0..0000000000
--- a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 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 | 16 ++++++++++++----
11 1 file changed, 12 insertions(+), 4 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 5383cec..c29a902 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
18 )
19 AC_MSG_RESULT([$WITH_PCRE])
20
21-if test "$WITH_PCRE" != no; then
22- if test "$WITH_PCRE" != yes; then
23- PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
24- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
25+if test "$WITH_PCRE" != "no"; then
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+
33+ 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
40--
412.15.0
42
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
index 32b0ae4ace..583b0e260c 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
@@ -17,7 +17,6 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
17 file://index.html.lighttpd \ 17 file://index.html.lighttpd \
18 file://lighttpd.conf \ 18 file://lighttpd.conf \
19 file://lighttpd \ 19 file://lighttpd \
20 file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
21 " 20 "
22 21
23SRC_URI[sha256sum] = "43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432" 22SRC_URI[sha256sum] = "43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432"