[PATCH] openssl: Repace if-else with case and add musl triplet

[PATCH] openssl: Repace if-else with case and add musl triplet

[Khem Raj]

Simplifies the code and adds knowlwdge about musl targets

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-connectivity/openssl/openssl.inc |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index b839c00..e585dbb 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -60,17 +60,15 @@ do_configure () {
 	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
 
 	os=${HOST_OS}
-	if [ "x$os" = "xlinux-uclibc" ]; then
+	case $os in
+	linux-uclibc* |\
+	linux-musl* |\
+	linux-gnu*)
 		os=linux
-	elif [ "x$os" = "xlinux-uclibceabi" ]; then
-		os=linux
-	elif [ "x$os" = "xlinux-uclibcspe" ]; then
-		os=linux
-	elif [ "x$os" = "xlinux-gnuspe" ]; then
-		os=linux
-	elif [ "x$os" = "xlinux-gnueabi" ]; then
-		os=linux
-	fi
+		;;
+		*)
+		;;
+	esac
 	target="$os-${HOST_ARCH}"
 	case $target in
 	linux-arm)
-- 
1.7.10.4

Re: [PATCH] openssl: Repace if-else with case and add musl triplet

[Richard Purdie]

On Thu, 2014-08-14 at 02:51 -0700, Khem Raj wrote:
> Simplifies the code and adds knowlwdge about musl targets
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-connectivity/openssl/openssl.inc |   18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)

This breaks x32 builds:

https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/204/steps/BuildImages/logs/stdio

(target doesn't end up set to linux-x32 which it needs to be)

Cheers,

Richard

> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index b839c00..e585dbb 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -60,17 +60,15 @@ do_configure () {
>  	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
>  
>  	os=${HOST_OS}
> -	if [ "x$os" = "xlinux-uclibc" ]; then
> +	case $os in
> +	linux-uclibc* |\
> +	linux-musl* |\
> +	linux-gnu*)
>  		os=linux
> -	elif [ "x$os" = "xlinux-uclibceabi" ]; then
> -		os=linux
> -	elif [ "x$os" = "xlinux-uclibcspe" ]; then
> -		os=linux
> -	elif [ "x$os" = "xlinux-gnuspe" ]; then
> -		os=linux
> -	elif [ "x$os" = "xlinux-gnueabi" ]; then
> -		os=linux
> -	fi
> +		;;
> +		*)
> +		;;
> +	esac
>  	target="$os-${HOST_ARCH}"
>  	case $target in
>  	linux-arm)
> -- 
> 1.7.10.4
> 

Re: [PATCH] openssl: Repace if-else with case and add musl triplet

[Khem Raj]

On Fri, Aug 15, 2014 at 10:17 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> This breaks x32 builds:
>
> https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/204/steps/BuildImages/logs/stdio
>
> (target doesn't end up set to linux-x32 which it needs to be)
>

oops it will also break mips64/n32 :(. I have posted a V2 to address
both the issues