diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2019-09-25 14:14:58 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-25 09:48:19 -0700 |
commit | 54f0796cb0f2ca98d4513e6434e4517fbc6b8067 (patch) | |
tree | 8240a2f0c418d7a6551ca6cfda57de70722c1411 | |
parent | c636bc25dba745eb459cc6d55b0d86ef09253016 (diff) | |
download | meta-openembedded-contrib-54f0796cb0f2ca98d4513e6434e4517fbc6b8067.tar.gz |
libmicrohttpd: backport the fix for building with older gnutls
* with gnutls from meta-gplv2 libmicrohttpd fails to build now:
libmicrohttpd-0.9.66/src/microhttpd/daemon.c:2539:7: error: unknown type name 'gnutls_init_flags_t'; did you mean 'gnutls_pin_flag_t'?
2539 | gnutls_init_flags_t flags;
backport the fix from master branch
* see https://bugs.gnunet.org/view.php?id=5806
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch new file mode 100644 index 0000000000..61a7ac0a60 --- /dev/null +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch @@ -0,0 +1,32 @@ +From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 +From: Christian Grothoff <christian@grothoff.org> +Date: Fri, 2 Aug 2019 15:43:44 +0200 +Subject: trying to fix #5806 + +Upstream-Status: Backport from 0.9.67 [https://git.gnunet.org/libmicrohttpd.git/commit/?id=b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f] + +--- + src/microhttpd/daemon.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c +index bf01ba9b..a8fc98c6 100644 +--- a/src/microhttpd/daemon.c ++++ b/src/microhttpd/daemon.c +@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon, + else + { + #ifdef HTTPS_SUPPORT +- gnutls_init_flags_t flags; ++#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) ++ gnutls_init_flags_t ++#else ++ unsigned int ++#endif ++ flags; + + flags = GNUTLS_SERVER; + #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) +-- +cgit v1.2.1 + diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb index 7d349b94e4..6b54170049 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb @@ -6,7 +6,9 @@ SECTION = "net" DEPENDS = "file" -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ + file://fix-build-with-older-gnutls.patch \ +" SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" |