diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-08-29 17:30:17 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-03 09:58:27 +0100 |
| commit | 45fac4161cb230bc03c6c08d21cc768e52700f02 (patch) | |
| tree | 1f795d6d2ebc15614ee582824439535340ca0bff /meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch | |
| parent | 5c2fcbc42dc85764863771ed62c7415aafb85916 (diff) | |
| download | openembedded-core-contrib-45fac4161cb230bc03c6c08d21cc768e52700f02.tar.gz | |
lighttpd: update to 1.4.41
Rebase pkgconfig.patch
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch')
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch | 37 |
1 files changed, 37 insertions, 0 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 new file mode 100644 index 0000000000..b8c7f37514 --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch @@ -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 + |