summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-23 19:38:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:41 +0100
commit474076a826f1d4bc0f9b485e1e5e9c305283d439 (patch)
tree3f01d21314f35e46055e8212f7574fd6669e6745 /meta/recipes-connectivity
parentd0278a1991b89a3e3d721d8e3561c63351e191a2 (diff)
downloadpoky-474076a826f1d4bc0f9b485e1e5e9c305283d439.tar.gz
openssl_1.0: fix cryptodev-linux PACKAGECONFIG support
Since openssl isn't an autotools recipe, defining cryptodev-linux related config options via PACKAGECONFIG hasn't worked correctly since PACKAGECONFIG_CONFARGS stopped being automatically appended to EXTRA_OECONF in 2016: http://git.openembedded.org/openembedded-core/commit/?id=c98fb5f5129e71829ffab4449b3d28082bc95ab4 The issue appears to have been hidden as the flags are also hardcoded in CFLAG - and therefore always enabled, regardless of the state of the PACKAGECONFIG option. Fix by passing both EXTRA_OECONF and PACKAGECONFIG_CONFARGS when running the openssl Configure script. Although the openssl 1.1 recipe doesn't contain any PACKAGECONFIG options yet, pre-emptively make the same fix there too. Also only enable cryptodev-linux by default for target builds (based on the historical comments in the recipe, that seems to have been the original intention). (From OE-Core rev: 6fee11b04b979a5b3237902d947db7118cafca2b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2o.bb9
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0h.bb2
2 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 9bc9e64c12..d9e9c8408e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -63,6 +63,9 @@ UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
63inherit pkgconfig siteinfo multilib_header ptest relative_symlinks 63inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
64 64
65PACKAGECONFIG ?= "cryptodev-linux" 65PACKAGECONFIG ?= "cryptodev-linux"
66PACKAGECONFIG_class-native = ""
67PACKAGECONFIG_class-nativesdk = ""
68
66PACKAGECONFIG[perl] = ",,," 69PACKAGECONFIG[perl] = ",,,"
67PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux" 70PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux"
68 71
@@ -88,10 +91,6 @@ CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB
88# (and it causes issues with SELinux) 91# (and it causes issues with SELinux)
89CFLAG += "-Wa,--noexecstack" 92CFLAG += "-Wa,--noexecstack"
90 93
91# For target side versions of openssl enable support for OCF Linux driver
92# if they are available.
93CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
94
95CFLAG_append_class-native = " -fPIC" 94CFLAG_append_class-native = " -fPIC"
96 95
97do_configure_prepend_darwin () { 96do_configure_prepend_darwin () {
@@ -208,7 +207,7 @@ do_configure () {
208 useprefix=/ 207 useprefix=/
209 fi 208 fi
210 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)" 209 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
211 perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=$libdirleaf $target 210 perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=$libdirleaf $target
212} 211}
213 212
214do_compile_prepend_class-target () { 213do_compile_prepend_class-target () {
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 8d445e4655..c0aaaf654e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -126,7 +126,7 @@ do_configure () {
126 useprefix=/ 126 useprefix=/
127 fi 127 fi
128 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)" 128 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
129 perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target 129 perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target
130} 130}
131 131
132do_install () { 132do_install () {