aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2018-08-20 23:14:39 +0200
committerRichard Leitner <richard.leitner@skidata.com>2018-10-02 07:59:06 +0200
commit52479af161f235095b8a4b85e5de54c4edfb0754 (patch)
tree9687ff2c77c71e33b18f09255aeae9878370679b /recipes-core/openjdk
parentb8763325d9cb6d27d6215b51bc87658f97b36913 (diff)
downloadmeta-java-52479af161f235095b8a4b85e5de54c4edfb0754.tar.gz
meta-java-52479af161f235095b8a4b85e5de54c4edfb0754.tar.bz2
meta-java-52479af161f235095b8a4b85e5de54c4edfb0754.zip
openjdk-7: 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. Furthermore remove the duplicated LLVM_CONFIGURE_ARCH export. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc3
-rw-r--r--recipes-core/openjdk/openjdk-common.inc40
2 files changed, 2 insertions, 41 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 0ef6758..6b02a4f 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -126,9 +126,6 @@ EXTRA_OEMAKE += ' \
UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
'
-# Provides the target architecture to the configure script.
-export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}"
-
OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}"
OE_LAUNCHER_LDFLAGS_arm = ""
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc
index 4e2eb94..ce3e39e 100644
--- a/recipes-core/openjdk/openjdk-common.inc
+++ b/recipes-core/openjdk/openjdk-common.inc
@@ -21,46 +21,10 @@ inherit openjdk-build-helper
B = "${S}/build"
-# OpenJDK uses slightly different names for certain arches. We need to know
-# this to create some files which are expected by the build.
-def get_jdk_arch(d):
- import bb
-
- jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
- if jdk_arch == "x86-64":
- jdk_arch = "amd64"
- elif jdk_arch == "powerpc":
- jdk_arch = "ppc"
- elif jdk_arch == "powerpc64":
- jdk_arch = "ppc64"
- elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"):
- jdk_arch = "i386"
-
- return jdk_arch
-
-JDK_ARCH = "${@get_jdk_arch(d)}"
+JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}"
JDK_HOME = "${libdir_jvm}/${JDK_DIR}"
JDK_FAKE = "${WORKDIR}/fake-jdk"
-# A function that is needed in the Shark builds.
-def get_llvm_configure_arch(d):
- import bb;
-
- arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
- if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686":
- arch = "x86"
- elif arch == "arm":
- arch = "arm"
- elif arch == "mipsel" or arch == "mips":
- arch = "mips"
- elif arch == "powerpc" or arch == "powerpc64":
- arch = "powerpc"
- else:
- if 'shark' in d.getVar('PACKAGECONFIG').split():
- bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN', True), arch) );
-
- return arch
-
# Puts an OE specific string into the binary making it possible for the user
# to know where it comes from (and blame the right people ...).
DIST_ID = "Built for ${DISTRO}"
@@ -72,7 +36,7 @@ EXTRA_OEMAKE = 'DIST_NAME="${DIST_NAME}" DIST_ID="${DIST_ID}"'
export WANT_LLVM_RELEASE = "2.8"
# Provides the target architecture to the configure script.
-export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}"
+export LLVM_CONFIGURE_ARCH="${@openjdk_build_helper_get_llvm_configure_arch(d)}"
# Large stack is required at least on x86_64 host, otherwise random segfaults appear:
QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152"