[OE-core] [PATCH] openssl: Repace if-else with case and add musl triplet
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Aug 15 17:17:45 UTC 2014
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 at 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
>
More information about the Openembedded-core
mailing list