diff options
| author | Richard Leitner <richard.leitner@skidata.com> | 2019-07-10 09:31:30 +0200 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2019-12-27 12:14:00 +0100 |
| commit | 541dfa20ec6cfca63ed48eecf8fc934268f7ca39 (patch) | |
| tree | 0a411b1b68171b8e01126e3c2df1984059ea2af9 | |
| parent | fd72459b6e1ac9f0bb11422761524396aeae249c (diff) | |
| download | meta-java-541dfa20ec6cfca63ed48eecf8fc934268f7ca39.tar.gz | |
icedtea7-native: use openjdk build helper functions
Replace target arch selection switch with functions from the openjdk
build helper.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
| -rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index b578cb2..c7c3bd6 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
| @@ -94,18 +94,8 @@ JDK_DIR = "icedtea7-native" | |||
| 94 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" | 94 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" |
| 95 | 95 | ||
| 96 | do_configure_prepend() { | 96 | do_configure_prepend() { |
| 97 | case "${TRANSLATED_TARGET_ARCH}" in | 97 | arch="${@openjdk_build_helper_get_icedtea_arch(d)}" |
| 98 | x86-64) | 98 | libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" |
| 99 | libarch=amd64 | ||
| 100 | ;; | ||
| 101 | i386|i486|i586|i686) | ||
| 102 | libarch=x86 | ||
| 103 | ;; | ||
| 104 | *) | ||
| 105 | arch=${TARGET_ARCH} | ||
| 106 | libarch=${TARGET_ARCH} | ||
| 107 | ;; | ||
| 108 | esac | ||
| 109 | 99 | ||
| 110 | # Automatically copy everything that starts with "icedtea" and ends with | 100 | # Automatically copy everything that starts with "icedtea" and ends with |
| 111 | # ".patch" into the patches directory. | 101 | # ".patch" into the patches directory. |
