diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2018-08-20 23:14:40 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-10-02 07:59:06 +0200 |
commit | a8415faa99f643e794ca2e0b920aff38ae348b75 (patch) | |
tree | 7e352fdc427744b817e8cbc26dcd1d9b05659b8b /recipes-core/icedtea/icedtea7-native.inc | |
parent | 52479af161f235095b8a4b85e5de54c4edfb0754 (diff) | |
download | meta-java-a8415faa99f643e794ca2e0b920aff38ae348b75.tar.gz |
icedtea7-native: use openjdk_build_helper's ARCH translation functions
As the openjdk_build_helper now provides the ARCH translation function
use those and drop the local ones.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/icedtea/icedtea7-native.inc')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 30fb24a..69f5d25 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -175,22 +175,8 @@ do_compile() { | |||
175 | # in order to start java when the amount of RAM is limited for the user. | 175 | # in order to start java when the amount of RAM is limited for the user. |
176 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 176 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
177 | 177 | ||
178 | # OpenJDK uses slightly different names for certain arches. We need to know | 178 | arch="${@openjdk_build_helper_get_icedtea_arch(d)}" |
179 | # this to create some files which are expected by the build. | 179 | libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" |
180 | case "${TRANSLATED_TARGET_ARCH}" in | ||
181 | x86-64) | ||
182 | arch=amd64 | ||
183 | libarch=amd64 | ||
184 | ;; | ||
185 | i386|i486|i586|i686) | ||
186 | arch=x86 | ||
187 | libarch=x86 | ||
188 | ;; | ||
189 | *) | ||
190 | arch=${TARGET_ARCH} | ||
191 | libarch=${TARGET_ARCH} | ||
192 | ;; | ||
193 | esac | ||
194 | 180 | ||
195 | install -d openjdk-boot/control/build/linux-$arch/hotspot/import/jre/lib | 181 | install -d openjdk-boot/control/build/linux-$arch/hotspot/import/jre/lib |
196 | if [ $libarch != $arch ]; then | 182 | if [ $libarch != $arch ]; then |
@@ -217,30 +203,8 @@ do_compile() { | |||
217 | oe_runmake icedtea | 203 | oe_runmake icedtea |
218 | } | 204 | } |
219 | 205 | ||
220 | def jdk_arch(d): | ||
221 | import bb | ||
222 | |||
223 | target_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) | ||
224 | |||
225 | if target_arch in ['i386', 'i486', 'i586', 'i686']: | ||
226 | return "x86" | ||
227 | elif target_arch in ['x86-64']: | ||
228 | return "amd64" | ||
229 | |||
230 | return target_arch | ||
231 | |||
232 | do_install() { | 206 | do_install() { |
233 | case "${TRANSLATED_TARGET_ARCH}" in | 207 | JDK_ARCH="${@openjdk_build_helper_get_icedtea_arch(d)}" |
234 | x86-64) | ||
235 | JDK_ARCH=amd64 | ||
236 | ;; | ||
237 | i386|i486|i586|i686) | ||
238 | JDK_ARCH=x86 | ||
239 | ;; | ||
240 | *) | ||
241 | JDK_ARCH=${TARGET_ARCH} | ||
242 | ;; | ||
243 | esac | ||
244 | 208 | ||
245 | install -d ${JDK_INSTALL_DIR} | 209 | install -d ${JDK_INSTALL_DIR} |
246 | 210 | ||