[OE-core] [oe-commits] [openembedded-core] 13/55: lighttpd: update to 1.4.41
Martin Jansa
martin.jansa at gmail.com
Tue Sep 6 21:38:23 UTC 2016
On Sat, Sep 03, 2016 at 08:59:53AM +0000, git at git.openembedded.org wrote:
> rpurdie pushed a commit to branch master
> in repository openembedded-core.
>
> commit 45fac4161cb230bc03c6c08d21cc768e52700f02
> Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> AuthorDate: Mon Aug 29 17:30:17 2016 +0300
>
> lighttpd: update to 1.4.41
>
> Rebase pkgconfig.patch
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Am I the only one seeing:
ERROR: lighttpd-1.4.41-r0 do_configure: QA Issue: lighttpd: configure was passed unrecognised options: --without-memcache [unknown-configure-option]
ERROR: lighttpd-1.4.41-r0 do_configure: Fatal QA errors found, failing task.
ERROR: lighttpd-1.4.41-r0 do_configure: Function failed: do_qa_configure
?
> ---
> ...fig-for-pcre-dependency-instead-of-config.patch | 37 ++++++++++++++++++++++
> .../lighttpd/lighttpd/pkgconfig.patch | 33 -------------------
> .../{lighttpd_1.4.39.bb => lighttpd_1.4.41.bb} | 6 ++--
> 3 files changed, 40 insertions(+), 36 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 0000000..b8c7f37
> --- /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 at 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 at 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
> +
> diff --git a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
> deleted file mode 100644
> index e395f92..0000000
> --- 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)
> diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
> similarity index 91%
> rename from meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
> rename to meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
> index 378accb..a74d3a1 100644
> --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
> +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
> @@ -20,11 +20,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
> file://lighttpd.conf \
> file://lighttpd \
> file://lighttpd.service \
> - file://pkgconfig.patch \
> + file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
> "
>
> -SRC_URI[md5sum] = "63c7563be1c7a7a9819a51f07f1af8b2"
> -SRC_URI[sha256sum] = "7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b"
> +SRC_URI[md5sum] = "1df2e4dbc965cfe6f99f008ac3db4d8d"
> +SRC_URI[sha256sum] = "4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c"
>
> PACKAGECONFIG ??= "openssl"
> PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160906/7d95dab0/attachment-0002.sig>
More information about the Openembedded-core
mailing list