diff options
| author |   Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-05-12 18:10:34 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-14 14:13:50 +0100 |
| commit | cf4c4c65df5349b60895525418954281b3140173 (patch) | |
| tree | d43b320c25292580e4cda7887c999e28a4e2b179 /meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch | |
| parent | 5f7df08aca81ac269490876fe84c7fc5b1d5739c (diff) | |
| download | openembedded-core-cf4c4c65df5349b60895525418954281b3140173.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
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_.patch | 36 |
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 @@ +From ffee6b5f6204a0210f717968ec6ce514d70acca1 Mon Sep 17 00:00:00 2001 +From: Haiqing Bai <Haiqing.Bai@windriver.com> +Date: Fri, 9 Dec 2016 15:23:17 +0800 +Subject: [PATCH] nettle: check header files of openssl only if + 'enable_openssl=yes'. + +The original configure script checks openssl header files to generate +config.h even if 'enable_openssl' is not set to yes, this made inconsistent +building for nettle. + +Upstream-Status: Pending +Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> + +refactored for 3.4. pending not in as of 3.4 + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: nettle-3.4/configure.ac +=================================================================== +--- nettle-3.4.orig/configure.ac ++++ nettle-3.4/configure.ac +@@ -185,9 +185,11 @@ AC_HEADER_TIME + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(size_t) + +-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, +-[enable_openssl=no +- break]) ++if test "x$enable_openssl" = "xyes"; then ++ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, ++ [enable_openssl=no ++ break]) ++fi + + # For use by the testsuite + AC_CHECK_HEADERS([valgrind/memcheck.h]) |