From 373763d4f6668c3e324edf8d699c8c15d0267278 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 9 Mar 2018 11:55:14 +0100 Subject: openssl: fix libdir logic to allow multiarch style paths The recipes were using 'basename' to turn '/usr/lib' into 'lib', which breaks when libdir is '/usr/lib/tuple', leading to libraries ending up in '/usr/tuple', which isn't in FILES_*. Change the logic to use sed to strip the prefix instead. (From OE-Core rev: e58d5521c7bae8daafdac85754545be176550a02) Signed-off-by: Koen Kooi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-connectivity/openssl/openssl10.inc | 3 ++- meta/recipes-connectivity/openssl/openssl_1.1.0g.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc index 9335b0b8bd..800910aa09 100644 --- a/meta/recipes-connectivity/openssl/openssl10.inc +++ b/meta/recipes-connectivity/openssl/openssl10.inc @@ -151,7 +151,8 @@ do_configure () { if [ "x$useprefix" = "x" ]; then useprefix=/ fi - perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target + libdirleaf="$(echo ${libdir} | sed s:$useprefix::)" + perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=${libdirleaf} $target } do_compile_prepend_class-target () { diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb index 1649bffaa1..4cc5edcadc 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb @@ -110,7 +110,8 @@ do_configure () { if [ "x$useprefix" = "x" ]; then useprefix=/ fi - perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=`basename ${libdir}` $target + libdirleaf="$(echo ${libdir} | sed s:$useprefix::)" + perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target } #| engines/afalg/e_afalg.c: In function 'eventfd': -- cgit 1.2.3-korg