mirror of
https://git.yoctoproject.org/poky
synced 2026-03-25 19:02:23 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
6778f069ca
commit
cc5791aa4e
@@ -1,42 +0,0 @@
|
||||
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.
|
||||
|
||||
RP 2014/5/22
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
configure.ac | 16 ++++++++++++----
|
||||
1 file changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5383cec..c29a902 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -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])
|
||||
+ ])
|
||||
+
|
||||
+ 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.15.0
|
||||
|
||||
@@ -17,7 +17,6 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
|
||||
file://index.html.lighttpd \
|
||||
file://lighttpd.conf \
|
||||
file://lighttpd \
|
||||
file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432"
|
||||
|
||||
Reference in New Issue
Block a user