summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-05-12 18:10:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-14 14:15:11 +0100
commite12098a6121522c8a901397b330631ba799a0f8d (patch)
treeb377bdf6f29563069abfaebeb56f71d7be78db2c /meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch
parentf63e51a165362dcf25f35bf9fb3370bf9bf2fd5a (diff)
downloadpoky-e12098a6121522c8a901397b330631ba799a0f8d.tar.gz
nettle: upgrade 3.5.1 -> 3.6
refresh the following patches: Add-target-to-only-build-tests-not-run-them.patch dlopen-test.patch (From OE-Core rev: cf4c4c65df5349b60895525418954281b3140173) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch')
-rw-r--r--meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch
new file mode 100644
index 0000000000..d5f266681e
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch
@@ -0,0 +1,36 @@
1From ffee6b5f6204a0210f717968ec6ce514d70acca1 Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Fri, 9 Dec 2016 15:23:17 +0800
4Subject: [PATCH] nettle: check header files of openssl only if
5 'enable_openssl=yes'.
6
7The original configure script checks openssl header files to generate
8config.h even if 'enable_openssl' is not set to yes, this made inconsistent
9building for nettle.
10
11Upstream-Status: Pending
12Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
13
14refactored for 3.4. pending not in as of 3.4
15
16Signed-off-by: Armin Kuster <akuster@mvista.com>
17
18Index: nettle-3.4/configure.ac
19===================================================================
20--- nettle-3.4.orig/configure.ac
21+++ nettle-3.4/configure.ac
22@@ -185,9 +185,11 @@ AC_HEADER_TIME
23 AC_CHECK_SIZEOF(long)
24 AC_CHECK_SIZEOF(size_t)
25
26-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
27-[enable_openssl=no
28- break])
29+if test "x$enable_openssl" = "xyes"; then
30+ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
31+ [enable_openssl=no
32+ break])
33+fi
34
35 # For use by the testsuite
36 AC_CHECK_HEADERS([valgrind/memcheck.h])