mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

openssl: consolidate target name mapping rules

Browse Source 
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).

(From OE-Core rev: bdc9e773c240716c2e2a60ca5d4313cfaa6188b1)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2018-08-16 21:43:31 -07:00
committed by Richard Purdie
parent 5afc46a9a9
commit 440cc5bd8d
2 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
+2 -5
View File
@@ -164,7 +164,7 @@ do_configure () {
linux-mips*) linux-mips*)
target=debian-mips target=debian-mips
;; ;;
linux-microblaze*|linux-nios2*|linux-gnu*ilp32**) linux-microblaze* | linux-nios2* | linux-gnu*ilp32**)
target=linux-generic32 target=linux-generic32
;; ;;
linux-powerpc) linux-powerpc)
@@ -179,10 +179,7 @@ do_configure () {
linux-riscv64) linux-riscv64)
target=linux-generic64 target=linux-generic64
;; ;;
linux-supersparc) linux-sparc | linux-supersparc)
target=linux-sparcv8
;;
linux-sparc)
target=linux-sparcv8 target=linux-sparcv8
;; ;;
esac esac
meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+6 -33
View File
@@ -51,28 +51,13 @@ do_configure () {
esac esac
target="$os-${HOST_ARCH}" target="$os-${HOST_ARCH}"
case $target in case $target in
linux-arm) linux-arm*)
target=linux-armv4
;;
linux-armeb)
target=linux-armv4 target=linux-armv4
;; ;;
linux-aarch64*) linux-aarch64*)
target=linux-aarch64 target=linux-aarch64
;; ;;
linux-sh3) linux-i?86 | linux-viac3)
target=linux-generic32
;;
linux-sh4)
target=linux-generic32
;;
linux-i486)
target=linux-elf
;;
linux-i586 | linux-viac3)
target=linux-elf
;;
linux-i686)
target=linux-elf target=linux-elf
;; ;;
linux-gnux32-x86_64 | linux-muslx32-x86_64 ) linux-gnux32-x86_64 | linux-muslx32-x86_64 )
@@ -81,23 +66,17 @@ do_configure () {
linux-gnu64-x86_64) linux-gnu64-x86_64)
target=linux-x86_64 target=linux-x86_64
;; ;;
linux-mips) linux-mips | linux-mipsel)
# specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
target="linux-mips32 ${TARGET_CC_ARCH}" target="linux-mips32 ${TARGET_CC_ARCH}"
;; ;;
linux-mipsel)
target="linux-mips32 ${TARGET_CC_ARCH}"
;;
linux-gnun32-mips*) linux-gnun32-mips*)
target=linux-mips64 target=linux-mips64
;; ;;
linux-*-mips64 | linux-mips64) linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el)
target=linux64-mips64 target=linux64-mips64
;; ;;
linux-*-mips64el | linux-mips64el) linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4)
target=linux64-mips64
;;
linux-microblaze*|linux-nios2*)
target=linux-generic32 target=linux-generic32
;; ;;
linux-powerpc) linux-powerpc)
@@ -112,15 +91,9 @@ do_configure () {
linux-riscv64) linux-riscv64)
target=linux-generic64 target=linux-generic64
;; ;;
linux-supersparc) linux-sparc | linux-supersparc)
target=linux-sparcv9 target=linux-sparcv9
;; ;;
linux-sparc)
target=linux-sparcv9
;;
darwin-i386)
target=darwin-i386-cc
;;
esac esac
useprefix=${prefix} useprefix=${prefix}