Patchwork openssl: backport fix for empty prefix from oe master

login
register
mail settings
Submitter Phil Blundell
Date May 17, 2011, 12:35 p.m.
Message ID <1305635737.2429.198.camel@phil-desktop>
Download mbox | patch
Permalink /patch/4245/
State New, archived
Headers show

Comments

Phil Blundell - May 17, 2011, 12:35 p.m.
This fixes a build failure when ${prefix}="".

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-connectivity/openssl/openssl.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Richard Purdie - May 17, 2011, 1:49 p.m.
On Tue, 2011-05-17 at 13:35 +0100, Phil Blundell wrote:
> This fixes a build failure when ${prefix}="".
> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  meta/recipes-connectivity/openssl/openssl.inc |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)

Applied, thanks (when I can push to the repo).

Cheers,

Richard

Patch

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