diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2021-01-07 17:04:21 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-10 12:34:40 +0000 |
commit | ced238d8428da973473e805fd3d665dc626d9382 (patch) | |
tree | 166f12001dc499ea045a14baeb5ded2c9e4804c7 /meta/recipes-support/nettle/nettle-3.7/check-header-files-of-openssl-only-if-enable_.patch | |
parent | a018d62503b94f18b9a889b134ad46e6fecd116e (diff) | |
download | poky-ced238d8428da973473e805fd3d665dc626d9382.tar.gz |
nettle: upgrade 3.6 ->3.7
(From OE-Core rev: 83e2617fd693d3c8eb96622980cb229e64b01711)
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.7/check-header-files-of-openssl-only-if-enable_.patch')
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.7/check-header-files-of-openssl-only-if-enable_.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.7/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle-3.7/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.7/check-header-files-of-openssl-only-if-enable_.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From ffee6b5f6204a0210f717968ec6ce514d70acca1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
3 | Date: Fri, 9 Dec 2016 15:23:17 +0800 | ||
4 | Subject: [PATCH] nettle: check header files of openssl only if | ||
5 | 'enable_openssl=yes'. | ||
6 | |||
7 | The original configure script checks openssl header files to generate | ||
8 | config.h even if 'enable_openssl' is not set to yes, this made inconsistent | ||
9 | building for nettle. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
13 | |||
14 | refactored for 3.4. pending not in as of 3.4 | ||
15 | |||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | Index: 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]) | ||