summaryrefslogtreecommitdiffstats
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 14:48:06 +0100
commitd82ed45d390f48b950cc490a055daa746f4a716a (patch)
treeafd9aa27cfc6a49148837bcf6307cd5ddb998e08
parent1510fb829eff897efb888ae853d2ede90351c9a1 (diff)
downloadopenembedded-core-contrib-d82ed45d390f48b950cc490a055daa746f4a716a.tar.gz
openembedded-core-contrib-d82ed45d390f48b950cc490a055daa746f4a716a.tar.bz2
openembedded-core-contrib-d82ed45d390f48b950cc490a055daa746f4a716a.zip
openssl: backport fix for empty prefix from oe master
This fixes a build failure when ${prefix}="". Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () {
esac
# inject machine-specific flags
sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
- perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+ useprefix=${prefix}
+ if [ "x$useprefix" = "x" ]; then
+ useprefix=/
+ fi
+ perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target
}
do_compile () {