diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2018-03-09 11:55:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-15 03:38:46 -0700 |
| commit | e58d5521c7bae8daafdac85754545be176550a02 (patch) | |
| tree | f50a67e0ccdf015fb56df71c1cde1075fe2673d9 | |
| parent | 62434e5021b99391a0c129a40bf943465a19e7ce (diff) | |
| download | openembedded-core-e58d5521c7bae8daafdac85754545be176550a02.tar.gz openembedded-core-e58d5521c7bae8daafdac85754545be176550a02.tar.bz2 openembedded-core-e58d5521c7bae8daafdac85754545be176550a02.zip | |
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.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl10.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.0g.bb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc index 0598195965..645d64ec85 100644 --- a/meta/recipes-connectivity/openssl/openssl10.inc +++ b/meta/recipes-connectivity/openssl/openssl10.inc @@ -157,7 +157,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 53f397a3e0..0fd6819fff 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb @@ -116,7 +116,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': |