summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl.inc
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-05-17 13:35:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 15:14:45 +0100
commit8b32cd92a149f9572cb35611bf20a4e2bf6ddcef (patch)
tree0e7336cb240c42a288d49d3356f439226e24d111 /meta/recipes-connectivity/openssl/openssl.inc
parent8197f4dd579324c329d6259f7daec7bf32b9b7ce (diff)
downloadpoky-8b32cd92a149f9572cb35611bf20a4e2bf6ddcef.tar.gz
openssl: backport fix for empty prefix from oe master
This fixes a build failure when ${prefix}="". (From OE-Core rev: d82ed45d390f48b950cc490a055daa746f4a716a) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl.inc')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index fe168c3c2b..f1ac7186cd 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -89,7 +89,11 @@ do_configure () {
89 esac 89 esac
90 # inject machine-specific flags 90 # inject machine-specific flags
91 sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure 91 sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
92 perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target 92 useprefix=${prefix}
93 if [ "x$useprefix" = "x" ]; then
94 useprefix=/
95 fi
96 perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target
93} 97}
94 98
95do_compile () { 99do_compile () {