diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-22 10:55:50 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-28 08:27:02 +0100 |
| commit | 235f6c4497ee4491b2f034b2f019d8f453d171a8 (patch) | |
| tree | d0c691cb752d6aca1824903e11c5df39cf811df1 /meta/recipes-extended/lighttpd/lighttpd | |
| parent | 030e09fc5da0e3b25bf9da9415326e0defb47f7d (diff) | |
| download | ast2050-yocto-poky-235f6c4497ee4491b2f034b2f019d8f453d171a8.zip ast2050-yocto-poky-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/recipes-extended/lighttpd/lighttpd')
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch | 33 |
1 files changed, 33 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 0000000..e395f92 --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch @@ -0,0 +1,33 @@ +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) |
