From 7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Mon, 30 Dec 2019 15:35:59 +0100 Subject: openjdk-8: update to latest ga version 242 As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. Signed-off-by: Richard Leitner --- recipes-core/openjdk/openjdk-8-common.inc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'recipes-core/openjdk/openjdk-8-common.inc') diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 1fbe7fe..0ef4750 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -8,13 +8,13 @@ require openjdk-common.inc AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" - FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" # for weird openjdk-common.inc S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" +export TOPDIR="${S}" -SRC_URI = " \ +SRC_URI = "\ ${OPENJDK_URI} \ ${HOTSPOT_URI} \ ${CORBA_URI} \ @@ -155,16 +155,12 @@ def jdk_configure_options(d): do_unpack[postfuncs] += "do_unpack_extract_submodules" do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" -do_configure_prepend() { - export ${@jdk_environment_options(d)} -} - export DEBUG_BINARIES = "true" ALTERNATIVE_PRIORITY = "50" -OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}" -OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}" +OPENJDK_UPDATE_VERSION = "${PV}" +OPENJDK_BUILD_NUMBER = "ga" EXTRA_OECONF_append = "\ --with-build-number=${OPENJDK_BUILD_NUMBER} \ --with-update-version=${OPENJDK_UPDATE_VERSION} \ @@ -176,6 +172,7 @@ EXTRA_OECONF_append = "\ FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" +FLAGS_GCC9 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" # flags for -native, and for bits that need a host-tool during -cross BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" -- cgit v1.2.3-54-g00ecf