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/pkgconfig.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/pkgconfig.patch')
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch deleted file mode 100644 index e395f928ce..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -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) |