From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/7] openssl: consolidate target name mapping rules
Date: Thu, 16 Aug 2018 21:43:31 -0700 [thread overview]
Message-ID: <1534481017-17310-1-git-send-email-armccurdy@gmail.com> (raw)
Merge duplicates + minor reformatting (no functional changes).
Note that the openssl 1.1 recipe still needs to be updated to handle
MIPS Release 6 ISA targets (e.g. linux-mipsisa32r6, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../recipes-connectivity/openssl/openssl_1.0.2p.bb | 7 ++--
.../recipes-connectivity/openssl/openssl_1.1.0i.bb | 39 ++++------------------
2 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
index 5d41977..5a2593c 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
@@ -164,7 +164,7 @@ do_configure () {
linux-mips*)
target=debian-mips
;;
- linux-microblaze*|linux-nios2*|linux-gnu*ilp32**)
+ linux-microblaze* | linux-nios2* | linux-gnu*ilp32**)
target=linux-generic32
;;
linux-powerpc)
@@ -179,10 +179,7 @@ do_configure () {
linux-riscv64)
target=linux-generic64
;;
- linux-supersparc)
- target=linux-sparcv8
- ;;
- linux-sparc)
+ linux-sparc | linux-supersparc)
target=linux-sparcv8
;;
esac
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index 7929d81..8a8d928 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -51,28 +51,13 @@ do_configure () {
esac
target="$os-${HOST_ARCH}"
case $target in
- linux-arm)
- target=linux-armv4
- ;;
- linux-armeb)
+ linux-arm*)
target=linux-armv4
;;
linux-aarch64*)
target=linux-aarch64
;;
- linux-sh3)
- target=linux-generic32
- ;;
- linux-sh4)
- target=linux-generic32
- ;;
- linux-i486)
- target=linux-elf
- ;;
- linux-i586 | linux-viac3)
- target=linux-elf
- ;;
- linux-i686)
+ linux-i?86 | linux-viac3)
target=linux-elf
;;
linux-gnux32-x86_64 | linux-muslx32-x86_64 )
@@ -81,23 +66,17 @@ do_configure () {
linux-gnu64-x86_64)
target=linux-x86_64
;;
- linux-mips)
+ linux-mips | linux-mipsel)
# specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
target="linux-mips32 ${TARGET_CC_ARCH}"
;;
- linux-mipsel)
- target="linux-mips32 ${TARGET_CC_ARCH}"
- ;;
linux-gnun32-mips*)
target=linux-mips64
;;
- linux-*-mips64 | linux-mips64)
- target=linux64-mips64
- ;;
- linux-*-mips64el | linux-mips64el)
+ linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el)
target=linux64-mips64
;;
- linux-microblaze*|linux-nios2*)
+ linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4)
target=linux-generic32
;;
linux-powerpc)
@@ -112,15 +91,9 @@ do_configure () {
linux-riscv64)
target=linux-generic64
;;
- linux-supersparc)
- target=linux-sparcv9
- ;;
- linux-sparc)
+ linux-sparc | linux-supersparc)
target=linux-sparcv9
;;
- darwin-i386)
- target=darwin-i386-cc
- ;;
esac
useprefix=${prefix}
--
1.9.1
next reply other threads:[~2018-08-17 4:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-17 4:43 Andre McCurdy [this message]
2018-08-17 4:43 ` [PATCH 2/7] openssl: update 32bit x86 target from linux-elf -> linux-x86 Andre McCurdy
2018-08-17 4:43 ` [PATCH 3/7] openssl: minor reformatting to align the 1.0 and 1.1 recipes Andre McCurdy
2018-08-17 4:43 ` [PATCH 4/7] openssl: openssl-misc dependency on perl should be unconditional Andre McCurdy
2018-08-17 4:43 ` [PATCH 5/7] openssl: move the libdir openssl.cnf symlink into the openssl package Andre McCurdy
2018-08-17 4:43 ` [PATCH 6/7] openssl: fix path in nativesdk environment-setup script Andre McCurdy
2018-08-17 4:43 ` [PATCH 7/7] openssl: drop obsolete no-afalgeng workaround for aarch64 Andre McCurdy
2018-08-17 5:02 ` ✗ patchtest: failure for "openssl: consolidate target na..." and 6 more Patchwork
2018-08-17 5:41 ` Andre McCurdy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1534481017-17310-1-git-send-email-armccurdy@gmail.com \
--to=armccurdy@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox