diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-08-20 17:47:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-21 14:49:34 +0100 |
commit | c226820183f44a2830b5172cac5888b17872c5c8 (patch) | |
tree | d09513b478202b3de7865a44a10560eb1d9916f3 /meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | |
parent | ca0a40a852abed981d54503ef2d86708471c821e (diff) | |
download | openembedded-core-contrib-c226820183f44a2830b5172cac5888b17872c5c8.tar.gz |
openssl: fix hardcoded paths in native for openssl 1.1
Relying on hardcoded built-in paths causes openssl-native to not be
relocateable from sstate.
Solution for openssl 1.1, based on the existing solution from
openssl 1.0:
http://git.openembedded.org/openembedded-core/commit/?id=771d3123331fbfab1eb9ce47e3013eabcb2248f5
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl_1.1.0i.bb')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb index 507f8f881b..d2f2624f9e 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb @@ -14,6 +14,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ file://openssl-c_rehash.sh \ file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \ + file://0001-allow-OPENSSLDIR-and-ENGINESDIR-CFLAGS-to-be-control.patch \ " SRC_URI_append_class-nativesdk = " \ @@ -30,6 +31,9 @@ inherit lib_package multilib_header ptest relative_symlinks #| ./libcrypto.so: undefined reference to `makecontext' EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC" +EXTRA_OEMAKE_append_class-native = " OE_DOPENSSLDIR='/not/builtin' OE_DENGINESDIR='/not/builtin'" +EXTRA_OEMAKE_append_class-nativesdk = " OE_DOPENSSLDIR='/not/builtin' OE_DENGINESDIR='/not/builtin'" + do_configure () { os=${HOST_OS} case $os in @@ -116,6 +120,12 @@ do_install () { } do_install_append_class-native () { + create_wrapper ${D}${bindir}/openssl \ + OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \ + SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ + SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \ + OPENSSL_ENGINES=${libdir}/ssl-1.1/engines + # Install a custom version of c_rehash that can handle sysroots properly. # This version is used for example when installing ca-certificates during # image creation. |