From b369a51972c4e83f28cf02de2ef9caad3087f00b Mon Sep 17 00:00:00 2001
From: Richard Leitner <richard.leitner@skidata.com>
Date: Mon, 20 Aug 2018 23:16:13 +0200
Subject: openjdk-7: remove version dependent stuff from openjdk-common

Move the OpenJDK-7 specific parts from openjdk-common.inc to
openjdk-7-common.inc.

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
---
 recipes-core/openjdk/openjdk-7-common.inc | 38 +++++++++++++++++++++++++++++++
 recipes-core/openjdk/openjdk-common.inc   | 37 ------------------------------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 6b02a4f..6005394 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -1,4 +1,42 @@
+SUMMARY = "Java runtime based upon the OpenJDK- and Icedtea Project"
+HOMEPAGE = "http://icedtea.classpath.org"
+LICENSE  = "GPL-2.0-with-classpath-exception"
+PRIORITY = "optional"
+SECTION  = "libs"
+
+ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}"
+
+S = "${WORKDIR}/${ICEDTEA}"
+
+DEPENDS_append_libc-uclibc = " virtual/libiconv "
+
+# The OpenJDK build with interpreter optimizations for ARM depends on a binary
+# that generates constants for an assembler source file. There is no other
+# way than to generate this on a pseudo machine. Cross-compiling would not help
+# because structure sizes and/or alignment may differ.
+DEPENDS_append = " qemu-native "
+
+B = "${S}/build"
+
+JDK_HOME = "${libdir_jvm}/${JDK_DIR}"
+JDK_FAKE = "${WORKDIR}/fake-jdk"
+
+# 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}"
+DIST_NAME = "${DISTRO}"
+EXTRA_OEMAKE = 'DIST_NAME="${DIST_NAME}" DIST_ID="${DIST_ID}"'
+
+# llvm configure and compiles stuff
+export WANT_LLVM_RELEASE = "2.8"
+
+# Large stack is required at least on x86_64 host, otherwise random segfaults appear:
+QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152"
+
+EXTRA_OEMAKE += 'QEMU="${QEMU}"'
+
 require openjdk-common.inc
+
 ICEDTEA = "icedtea-${ICEDTEA_VERSION}"
 
 INC_PR = "r6"
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc
index ce3e39e..01a0a2a 100644
--- a/recipes-core/openjdk/openjdk-common.inc
+++ b/recipes-core/openjdk/openjdk-common.inc
@@ -1,44 +1,7 @@
-SUMMARY = "Java runtime based upon the OpenJDK- and Icedtea Project"
-HOMEPAGE = "http://icedtea.classpath.org"
-LICENSE  = "GPL-2.0-with-classpath-exception"
-PRIORITY = "optional"
-SECTION  = "libs"
-
-ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}"
-
-S = "${WORKDIR}/${ICEDTEA}"
-
-DEPENDS_append_libc-uclibc = " virtual/libiconv "
-
-# The OpenJDK build with interpreter optimizations for ARM depends on a binary
-# that generates constants for an assembler source file. There is no other
-# way than to generate this on a pseudo machine. Cross-compiling would not help
-# because structure sizes and/or alignment may differ.
-DEPENDS_append = " qemu-native "
-
 inherit java autotools gettext qemu pkgconfig
 inherit openjdk-build-helper
 
-B = "${S}/build"
-
 JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}"
-JDK_HOME = "${libdir_jvm}/${JDK_DIR}"
-JDK_FAKE = "${WORKDIR}/fake-jdk"
-
-# 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}"
-DIST_NAME = "${DISTRO}"
-EXTRA_OEMAKE = 'DIST_NAME="${DIST_NAME}" DIST_ID="${DIST_ID}"'
-
-# llvm configure and compiles stuff
-
-export WANT_LLVM_RELEASE = "2.8"
 
 # Provides the target architecture to the configure script.
 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"
-
-EXTRA_OEMAKE += 'QEMU="${QEMU}"'
-- 
cgit v1.2.3-54-g00ecf