summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-22 10:55:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-28 08:27:02 +0100
commit235f6c4497ee4491b2f034b2f019d8f453d171a8 (patch)
treed0c691cb752d6aca1824903e11c5df39cf811df1 /meta
parent030e09fc5da0e3b25bf9da9415326e0defb47f7d (diff)
downloadpoky-235f6c4497ee4491b2f034b2f019d8f453d171a8.tar.gz
lighthttp: Use pkg-config for pcre dependency
(From OE-Core rev: d2457880e7bb08b9c2f8d60e70b1d59ed84e9da9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch33
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
new file mode 100644
index 0000000000..e395f928ce
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
@@ -0,0 +1,33 @@
1Use pkg-config for pcre dependency instead of -config script.
2
3Upstream-Status: Pending
4
5RP 2014/5/22
6
7
8Index: lighttpd-1.4.35/configure.ac
9===================================================================
10--- lighttpd-1.4.35.orig/configure.ac 2014-03-06 14:08:00.000000000 +0000
11+++ lighttpd-1.4.35/configure.ac 2014-05-13 16:58:30.758471169 +0000
12@@ -309,16 +309,14 @@
13 AC_MSG_RESULT([$WITH_PCRE])
14
15 if test "$WITH_PCRE" != "no"; then
16- AC_PATH_PROG(PCRECONFIG, pcre-config)
17-
18- if test x"$PCRECONFIG" != x; then
19- PCRE_LIB=`$PCRECONFIG --libs`
20- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
21+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
22+ PCRE_LIB=${PCREPKG_LIBS}
23+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
24 AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
25 AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
26- else
27+ ], [
28 AC_MSG_ERROR([pcre-config not found, install the pcre-devel package or build with --without-pcre])
29- fi
30+ ])
31 fi
32
33 AC_SUBST(PCRE_LIB)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb
index bcab7d1931..0acc37d94f 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb
@@ -23,6 +23,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
23 file://lighttpd.conf \ 23 file://lighttpd.conf \
24 file://lighttpd \ 24 file://lighttpd \
25 file://lighttpd.service \ 25 file://lighttpd.service \
26 file://pkgconfig.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "f7a88130ee9984b421ad8aa80629750a" 29SRC_URI[md5sum] = "f7a88130ee9984b421ad8aa80629750a"