sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

nettle: Modify configure script to get consistent build. 

The original configure script detects the header files
of openssl to set variable like 'HAVE_OPENSSL_AES_H' in
config.h and ignore the value of '--enable-openssl', this
may cause inconsistent build.

(From OE-Core rev: 17e34c083aa53914610d8eca2341e82d0e1208e2)

Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Haiqing Bai 2017-01-05 11:32:54 +08:00 committed by Richard Purdie
parent c9e21f0266
commit 1da4d59ec7
4 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-support/nettle/nettle-2.7.1/check-header-files-of-openssl-only-if-enable_.patch Normal file
View File

@ -0,0 +1,38 @@
From c369dd7049f5a198f8b6c96fde6e294ce5146c2f Mon Sep 17 00:00:00 2001
From: Haiqing Bai <Haiqing.Bai@windriver.com>
Date: Fri, 9 Dec 2016 16:16:45 +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>
---
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 78a3d4e..4f16a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,9 +603,11 @@ AC_CHECK_ALIGNOF(uint64_t)
ALIGNOF_UINT64_T="$ac_cv_alignof_uint64_t"
AC_SUBST(ALIGNOF_UINT64_T)
-AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],,
-[enable_openssl=no
- break])
+if test "x$enable_openssl" = "xyes"; then
+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],,
+ [enable_openssl=no
+ break])
+fi
LSH_FUNC_ALLOCA
LSH_FUNC_STRERROR
--
1.9.1

38
meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch Normal file
View File

@ -0,0 +1,38 @@
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>
---
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4ead52c..982760f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,9 +185,11 @@ AC_HEADER_TIME
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(size_t)
-AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
-[enable_openssl=no
- break])
+if test "x$enable_openssl" = "xyes"; then
+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
+ [enable_openssl=no
+ break])
+fi
AC_CHECK_HEADERS([valgrind/memcheck.h])
--
1.9.1

1
meta/recipes-support/nettle/nettle_2.7.1.bb
View File

@ -13,6 +13,7 @@ SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6
SRC_URI += "\
file://CVE-2015-8803_8805.patch \
file://CVE-2015-8804.patch \
file://check-header-files-of-openssl-only-if-enable_.patch \
"
DISABLE_STATIC = ""

4
meta/recipes-support/nettle/nettle_3.3.bb
View File

@ -7,5 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6
file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
SRC_URI += "\
file://check-header-files-of-openssl-only-if-enable_.patch \
"
SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe"
SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e"