diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-02 09:42:42 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-03 11:12:25 +0000 |
| commit | 5845d1b0f92011ec69e46ba078165e410bb225da (patch) | |
| tree | 0d653cf79b2bdbe5c145fa5401b570a7e8c9a283 /meta | |
| parent | 6d4079f77e29a2ad6712a130d4a5493aace3eb10 (diff) | |
| download | poky-5845d1b0f92011ec69e46ba078165e410bb225da.tar.gz | |
lighttpd: upgrade 1.4.60 -> 1.4.61
(From OE-Core rev: 1377aeba6bbdb6a8d0bfa9cb754ef52f6e9b06d1)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb) | 3 |
2 files changed, 1 insertions, 40 deletions
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 deleted file mode 100644 index 2a9bb352b5..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From c1466f3620f608e4def4b8853c4e2bc6d9a19646 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Glenn Strauss <gstrauss@gluelogic.com> | ||
| 3 | Date: Mon, 4 Oct 2021 09:51:22 -0400 | ||
| 4 | Subject: [PATCH] define __BEGIN_DECLS, __END_DECLS if needed | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 8 | --- | ||
| 9 | src/first.h | 16 ++++++++++++++++ | ||
| 10 | 1 file changed, 16 insertions(+) | ||
| 11 | |||
| 12 | diff --git a/src/first.h b/src/first.h | ||
| 13 | index df747ba..9d0428a 100644 | ||
| 14 | --- a/src/first.h | ||
| 15 | +++ b/src/first.h | ||
| 16 | @@ -39,6 +39,22 @@ | ||
| 17 | #include <sys/types.h> | ||
| 18 | #include <stddef.h> | ||
| 19 | |||
| 20 | +#ifndef __BEGIN_DECLS | ||
| 21 | +#ifdef __cplusplus | ||
| 22 | +#define __BEGIN_DECLS extern "C" { | ||
| 23 | +#else | ||
| 24 | +#define __BEGIN_DECLS | ||
| 25 | +#endif | ||
| 26 | +#endif | ||
| 27 | + | ||
| 28 | +#ifndef __END_DECLS | ||
| 29 | +#ifdef __cplusplus | ||
| 30 | +#define __END_DECLS } | ||
| 31 | +#else | ||
| 32 | +#define __END_DECLS | ||
| 33 | +#endif | ||
| 34 | +#endif | ||
| 35 | + | ||
| 36 | #if defined HAVE_STDINT_H | ||
| 37 | # include <stdint.h> | ||
| 38 | #elif defined HAVE_INTTYPES_H | ||
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb index dca8934ad2..32b0ae4ace 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb | |||
| @@ -18,10 +18,9 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t | |||
| 18 | file://lighttpd.conf \ | 18 | file://lighttpd.conf \ |
| 19 | file://lighttpd \ | 19 | file://lighttpd \ |
| 20 | file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ | 20 | file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ |
| 21 | file://0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch \ | ||
| 22 | " | 21 | " |
| 23 | 22 | ||
| 24 | SRC_URI[sha256sum] = "4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0" | 23 | SRC_URI[sha256sum] = "43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432" |
| 25 | 24 | ||
| 26 | DEPENDS = "virtual/crypt" | 25 | DEPENDS = "virtual/crypt" |
| 27 | 26 | ||
