diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch new file mode 100644 index 000000000..e395f928c --- /dev/null +++ b/import-layers/yocto-poky/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) |