From: Phil Blundell <pb@pbcl.net>
Date: Tue, 17 May 2011 12:35:37 +0000 (+0100)
Subject: openssl: backport fix for empty prefix from oe master
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~45574
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d82ed45d390f48b950cc490a055daa746f4a716a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index fe168c3c2bc..f1ac7186cde 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 () {