diff options
| author | jeff <jhatch@multitech.com> | 2023-01-24 09:37:57 -0600 |
|---|---|---|
| committer | jeff <jhatch@multitech.com> | 2023-01-24 09:37:57 -0600 |
| commit | c94c9986362ebf4084734a3963415c5d894cf3a6 (patch) | |
| tree | 1f5d79df115e23318d93bfc9e99dddecf9be8748 /recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch | |
| parent | 8400520cffdd3c133c684eac60ab438a7ecaa050 (diff) | |
| parent | 2eaa3fd064097eb221b56d5df0e7136ba705a0cd (diff) | |
| download | meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.tar.gz meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.tar.bz2 meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.zip | |
Merge branch 'md/cve-fixes2-squashed' into 6
Diffstat (limited to 'recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch')
| -rw-r--r-- | recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch b/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch new file mode 100644 index 0000000..d5f2666 --- /dev/null +++ b/recipes-support/nettle/nettle/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]) |