Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- ...n-add-with_zstd-to-meson_options.txt.patch | 27 ------------- ...-__BEGIN_DECLS-__END_DECLS-if-needed.patch | 38 +++++++++++++++++++ ...{lighttpd_1.4.59.bb => lighttpd_1.4.60.bb} | 4 +- 3 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch create mode 100644 meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch rename meta/recipes-extended/lighttpd/{lighttpd_1.4.59.bb => lighttpd_1.4.60.bb} (95%)
diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch deleted file mode 100644 index ceedccbd11..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f24bd105388c305beeead5d3fa0a028b82354f18 Mon Sep 17 00:00:00 2001 -From: Glenn Strauss <gstra...@gluelogic.com> -Date: Wed, 3 Feb 2021 00:35:34 -0500 -Subject: [PATCH] [meson] add with_zstd to meson_options.txt - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> ---- - meson_options.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index 51bea44d..f6687159 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -148,6 +148,11 @@ option('with_zlib', - value: true, - description: 'with deflate-support for mod_deflate [default: on]', - ) -+option('with_zstd', -+ type: 'boolean', -+ value: false, -+ description: 'with zstd-support for mod_deflate [default: off]', -+) - - option('build_extra_warnings', - type: 'boolean', diff --git a/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch b/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch new file mode 100644 index 0000000000..2a9bb352b5 --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch @@ -0,0 +1,38 @@ +From c1466f3620f608e4def4b8853c4e2bc6d9a19646 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstra...@gluelogic.com> +Date: Mon, 4 Oct 2021 09:51:22 -0400 +Subject: [PATCH] define __BEGIN_DECLS, __END_DECLS if needed + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +--- + src/first.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/first.h b/src/first.h +index df747ba..9d0428a 100644 +--- a/src/first.h ++++ b/src/first.h +@@ -39,6 +39,22 @@ + #include <sys/types.h> + #include <stddef.h> + ++#ifndef __BEGIN_DECLS ++#ifdef __cplusplus ++#define __BEGIN_DECLS extern "C" { ++#else ++#define __BEGIN_DECLS ++#endif ++#endif ++ ++#ifndef __END_DECLS ++#ifdef __cplusplus ++#define __END_DECLS } ++#else ++#define __END_DECLS ++#endif ++#endif ++ + #if defined HAVE_STDINT_H + # include <stdint.h> + #elif defined HAVE_INTTYPES_H diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb similarity index 95% rename from meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb rename to meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb index 8cb3a9a18c..dca8934ad2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb @@ -18,10 +18,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://lighttpd.conf \ file://lighttpd \ file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ - file://0001-meson-add-with_zstd-to-meson_options.txt.patch \ + file://0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch \ " -SRC_URI[sha256sum] = "fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5" +SRC_URI[sha256sum] = "4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0" DEPENDS = "virtual/crypt" -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157124): https://lists.openembedded.org/g/openembedded-core/message/157124 Mute This Topic: https://lists.openembedded.org/mt/86442644/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-