summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2018-03-09 11:55:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 06:27:19 -0700
commit4712f75761ed093b03262a928539deb33470ae90 (patch)
tree29b9e20be7ca2fe73f32ec7491d1a759cc0f3960 /meta/recipes-connectivity/openssl
parentdc471563874db206f1a4e2aa521940b4bdec6b05 (diff)
downloadpoky-4712f75761ed093b03262a928539deb33470ae90.tar.gz
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 <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl10.inc3
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0g.bb3
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 () {
157 if [ "x$useprefix" = "x" ]; then 157 if [ "x$useprefix" = "x" ]; then
158 useprefix=/ 158 useprefix=/
159 fi 159 fi
160 perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target 160 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
161 perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=${libdirleaf} $target
161} 162}
162 163
163do_compile_prepend_class-target () { 164do_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 () {
116 if [ "x$useprefix" = "x" ]; then 116 if [ "x$useprefix" = "x" ]; then
117 useprefix=/ 117 useprefix=/
118 fi 118 fi
119 perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=`basename ${libdir}` $target 119 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
120 perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target
120} 121}
121 122
122#| engines/afalg/e_afalg.c: In function 'eventfd': 123#| engines/afalg/e_afalg.c: In function 'eventfd':