On Tue, 14 Nov 2017 16:57:51 +0200
Alexander Kanavin <alexander.kana...@linux.intel.com> wrote:
> Refresh the pcre pkg-config patch.
>
> Signed-off-by: Alexander Kanavin <alexander.kana...@linux.intel.com>
> ---
> ...fig-for-pcre-dependency-instead-of-config.patch | 48
> +++++++++++++---------
> .../{lighttpd_1.4.45.bb => lighttpd_1.4.48.bb} | 4 +-
> 2 files changed, 30 insertions(+), 22 deletions(-)
> rename meta/recipes-extended/lighttpd/{lighttpd_1.4.45.bb =>
> lighttpd_1.4.48.bb} (96%)
>
> 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
> index b8c7f375147..4b9372bfc1c 100644
> ---
> 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
> @@ -1,37 +1,45 @@
> -From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
> +From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kana...@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.kana...@gmail.com>
> +
> +
no need to include again your SOB.
> Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
> ---
> - configure.ac | 11 ++++++-----
> - 1 file changed, 6 insertions(+), 5 deletions(-)
> + configure.ac | 16 ++++++++++++----
> + 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> -index 1d172a1..a9236da 100644
> +index 5383cec..c29a902 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], [
> +@@ -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])
> -+ ])
> - fi
> -
> - if test x"$PCRE_LIB" != x; then
> ++ ])
> ++
> ++ 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.9.3
> +2.15.0
>
> diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
> b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
> similarity index 96%
> rename from meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
> rename to meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
> index 08dda33606c..3c4444cf423 100644
> --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
> +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
> @@ -20,8 +20,8 @@ SRC_URI =
> "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
>
> file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
> "
>
> -SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631"
> -SRC_URI[sha256sum] =
> "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f"
> +SRC_URI[md5sum] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8"
> +SRC_URI[sha256sum] =
> "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36"
>
> PACKAGECONFIG ??= "openssl pcre zlib \
> ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
> --
> 2.15.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
