diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2020-05-18 12:14:46 -0500 |
|---|---|---|
| committer | Serhii Kostiuk <serhii.o.kostiuk@globallogic.com> | 2020-05-21 11:01:26 +0300 |
| commit | f669783eba95a8b31776580e4e336678e0f474d9 (patch) | |
| tree | 0c95f5bdb15b2bef173cbdb5b64a3cdfd434fc59 /recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch | |
| parent | 0bddc1c82986fb8eb8ed8cab8ff1368274494765 (diff) | |
| parent | d252c15795b1da269e6144a75e07edb23a9a0fd5 (diff) | |
| download | meta-mlinux-f669783eba95a8b31776580e4e336678e0f474d9.tar.gz meta-mlinux-f669783eba95a8b31776580e4e336678e0f474d9.tar.bz2 meta-mlinux-f669783eba95a8b31776580e4e336678e0f474d9.zip | |
Merge branch 'ap/sync_up_with_master' into multiarch5-thud
Diffstat (limited to 'recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch')
| -rw-r--r-- | recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch b/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch new file mode 100644 index 0000000..48be920 --- /dev/null +++ b/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch @@ -0,0 +1,41 @@ +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 |