summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-cross.inc
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/openjdk-8-cross.inc
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.tar.gz
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 <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc27
1 files changed, 17 insertions, 10 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 18b99fd..6c0f949 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -13,6 +13,7 @@ PRIVATE_LIBS = "\
13 libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \ 13 libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \
14 libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \ 14 libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \
15 libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ 15 libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \
16 libfreetype.so.6 \
16" 17"
17 18
18PACKAGECONFIG ??= " \ 19PACKAGECONFIG ??= " \
@@ -42,23 +43,22 @@ PACKAGECONFIG[repack] = ",,,"
42 43
43PACKAGECONFIG[kerberos] = ",,krb5" 44PACKAGECONFIG[kerberos] = ",,krb5"
44 45
45CACHED_CONFIGUREVARS = " \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \
48"
49
50require openjdk-8-common.inc 46require openjdk-8-common.inc
51 47
52JAVA_HOME[unexport] = "1" 48JAVA_HOME[unexport] = "1"
53 49
54SRC_URI_append = "\ 50SRC_URI_append = "\
55 file://jvm.cfg \ 51 file://jvm.cfg \
52 file://0011-autoconf-fix-CC-with-arguments-detection.patch \
53 file://0012-autoconf-NativeCompilation-remove-sysroot.patch \
56" 54"
57 55
56BUILD_CFLAGS_append = " -Wno-stringop-overflow -Wno-error"
57TARGET_CFLAGS_append = " -Wno-stringop-overflow -Wno-error"
58
58EXTRA_OECONF_append = "\ 59EXTRA_OECONF_append = "\
59 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 60 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
60 \ 61 \
61 --with-sys-root=${STAGING_DIR_HOST} \
62 --with-tools-dir=${STAGING_DIR_NATIVE} \ 62 --with-tools-dir=${STAGING_DIR_NATIVE} \
63 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ 63 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \
64 --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ 64 --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \
@@ -66,13 +66,21 @@ EXTRA_OECONF_append = "\
66 --disable-precompiled-headers \ 66 --disable-precompiled-headers \
67 --disable-zip-debug-info \ 67 --disable-zip-debug-info \
68 \ 68 \
69 --with-sys-root=${STAGING_DIR_HOST} \
69 --with-extra-cflags='${CFLAGS}' \ 70 --with-extra-cflags='${CFLAGS}' \
70 --with-extra-cxxflags='${CXXFLAGS}' \ 71 --with-extra-cxxflags='${CXXFLAGS}' \
71 --with-extra-ldflags='${LDFLAGS}' \ 72 --with-extra-ldflags='${LDFLAGS}' \
73 --with-freetype-include=${STAGING_INCDIR}/freetype2 \
74 --with-freetype-lib=${STAGING_LIBDIR} \
72 \ 75 \
73 ${@jdk_configure_options(d)} \ 76 ${@jdk_configure_options(d)} \
74" 77"
75 78
79do_configure_prepend() {
80 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
81 export ${@jdk_environment_options(d)}
82}
83
76do_configure_append() { 84do_configure_append() {
77 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk 85 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk
78} 86}
@@ -97,8 +105,6 @@ do_install_append() {
97export MAKE_VERBOSE = "y" 105export MAKE_VERBOSE = "y"
98export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" 106export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip"
99 107
100BUILD_LD="${BUILD_CCLD}"
101
102EXTRA_OEMAKE_append = '\ 108EXTRA_OEMAKE_append = '\
103 ${@jdk_make_options(d)} \ 109 ${@jdk_make_options(d)} \
104 ALT_SDT_H="${STAGING_INCDIR}" \ 110 ALT_SDT_H="${STAGING_INCDIR}" \
@@ -125,5 +131,6 @@ python remove_debuglink() {
125 131
126PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" 132PACKAGE_PREPROCESS_FUNCS += "remove_debuglink"
127 133
128# There is a symlink to a .so but this one is valid. 134# FIXME libjsig.so is a symlink to a .so but this one is valid
129INSANE_SKIP_${PN} = "dev-so" 135# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped
136INSANE_SKIP_${PN} = "dev-so already-stripped"