summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-08-16 21:43:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-20 17:38:22 +0100
commit440cc5bd8d7b50ee56a9a88fbde2631912f68d63 (patch)
treedd3a93fd630b53b9b0484852a7ee417b77b792ab /meta/recipes-connectivity
parent5afc46a9a9e23597ec189c59be38547b0b2cf967 (diff)
downloadpoky-440cc5bd8d7b50ee56a9a88fbde2631912f68d63.tar.gz
openssl: consolidate target name mapping rules
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2p.bb7
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0i.bb39
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 5d419772f9..5a2593c0ae 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 () {
164 linux-mips*) 164 linux-mips*)
165 target=debian-mips 165 target=debian-mips
166 ;; 166 ;;
167 linux-microblaze*|linux-nios2*|linux-gnu*ilp32**) 167 linux-microblaze* | linux-nios2* | linux-gnu*ilp32**)
168 target=linux-generic32 168 target=linux-generic32
169 ;; 169 ;;
170 linux-powerpc) 170 linux-powerpc)
@@ -179,10 +179,7 @@ do_configure () {
179 linux-riscv64) 179 linux-riscv64)
180 target=linux-generic64 180 target=linux-generic64
181 ;; 181 ;;
182 linux-supersparc) 182 linux-sparc | linux-supersparc)
183 target=linux-sparcv8
184 ;;
185 linux-sparc)
186 target=linux-sparcv8 183 target=linux-sparcv8
187 ;; 184 ;;
188 esac 185 esac
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index 7929d81b45..8a8d928f5a 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 () {
51 esac 51 esac
52 target="$os-${HOST_ARCH}" 52 target="$os-${HOST_ARCH}"
53 case $target in 53 case $target in
54 linux-arm) 54 linux-arm*)
55 target=linux-armv4
56 ;;
57 linux-armeb)
58 target=linux-armv4 55 target=linux-armv4
59 ;; 56 ;;
60 linux-aarch64*) 57 linux-aarch64*)
61 target=linux-aarch64 58 target=linux-aarch64
62 ;; 59 ;;
63 linux-sh3) 60 linux-i?86 | linux-viac3)
64 target=linux-generic32
65 ;;
66 linux-sh4)
67 target=linux-generic32
68 ;;
69 linux-i486)
70 target=linux-elf
71 ;;
72 linux-i586 | linux-viac3)
73 target=linux-elf
74 ;;
75 linux-i686)
76 target=linux-elf 61 target=linux-elf
77 ;; 62 ;;
78 linux-gnux32-x86_64 | linux-muslx32-x86_64 ) 63 linux-gnux32-x86_64 | linux-muslx32-x86_64 )
@@ -81,23 +66,17 @@ do_configure () {
81 linux-gnu64-x86_64) 66 linux-gnu64-x86_64)
82 target=linux-x86_64 67 target=linux-x86_64
83 ;; 68 ;;
84 linux-mips) 69 linux-mips | linux-mipsel)
85 # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags 70 # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
86 target="linux-mips32 ${TARGET_CC_ARCH}" 71 target="linux-mips32 ${TARGET_CC_ARCH}"
87 ;; 72 ;;
88 linux-mipsel)
89 target="linux-mips32 ${TARGET_CC_ARCH}"
90 ;;
91 linux-gnun32-mips*) 73 linux-gnun32-mips*)
92 target=linux-mips64 74 target=linux-mips64
93 ;; 75 ;;
94 linux-*-mips64 | linux-mips64) 76 linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el)
95 target=linux64-mips64
96 ;;
97 linux-*-mips64el | linux-mips64el)
98 target=linux64-mips64 77 target=linux64-mips64
99 ;; 78 ;;
100 linux-microblaze*|linux-nios2*) 79 linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4)
101 target=linux-generic32 80 target=linux-generic32
102 ;; 81 ;;
103 linux-powerpc) 82 linux-powerpc)
@@ -112,15 +91,9 @@ do_configure () {
112 linux-riscv64) 91 linux-riscv64)
113 target=linux-generic64 92 target=linux-generic64
114 ;; 93 ;;
115 linux-supersparc) 94 linux-sparc | linux-supersparc)
116 target=linux-sparcv9
117 ;;
118 linux-sparc)
119 target=linux-sparcv9 95 target=linux-sparcv9
120 ;; 96 ;;
121 darwin-i386)
122 target=darwin-i386-cc
123 ;;
124 esac 97 esac
125 98
126 useprefix=${prefix} 99 useprefix=${prefix}