diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-30 15:35:59 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-17 13:02:40 +0200 |
commit | 040bfc7748f37b258f8f1d2c6f1d2d44127bf173 (patch) | |
tree | 4a147312e7398d03f0f8bbffd52f71233fa91957 /recipes-core/openjdk/openjdk-8-release-common.inc | |
parent | 4bcf80651fa555611c13c02eaab3529ccf31bbf6 (diff) | |
download | meta-java-040bfc7748f37b258f8f1d2c6f1d2d44127bf173.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-release-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-common.inc | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc new file mode 100644 index 0000000..bd3092f --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-common.inc | |||
@@ -0,0 +1,148 @@ | |||
1 | PATCHES_URI = "\ | ||
2 | file://0001-Allow-using-a-system-installed-libjpeg.patch \ | ||
3 | file://0002-Allow-using-a-system-installed-libpng.patch \ | ||
4 | file://0003-build-fix-build-on-as-needed-toolchains-generic.patch \ | ||
5 | file://0004-don-t-expect-fqpn-for-make.patch \ | ||
6 | file://0005-autoconf-filter-aclocal-copy-too.patch \ | ||
7 | file://0006-autoconf-handle-extra-output.patch \ | ||
8 | file://0007-fix-assembler-flag-handling-in-makefile.patch \ | ||
9 | file://0008-autoconf-fix-shark-build-common.patch \ | ||
10 | file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \ | ||
11 | file://0010-autoconf-remove-shell-variables-from-autoheader.patch \ | ||
12 | ${HOTSPOT_UB_PATCH} \ | ||
13 | file://2001-jdk-comparison-between-pointer-and-integer.patch \ | ||
14 | file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \ | ||
15 | file://2003-jdk-Allow-using-a-system-installed-libpng.patch \ | ||
16 | file://2004-jdk-use-correct-include-for-poll.patch \ | ||
17 | file://2005-jdk-use-correct-include-for-signal.patch \ | ||
18 | file://2006-jdk-disable-backtrace-musl-build-fix.patch \ | ||
19 | file://2007-jdk-no-genx11-in-headless.patch \ | ||
20 | file://2008-jdk-no-unused-deps.patch \ | ||
21 | file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \ | ||
22 | " | ||
23 | HOTSPOT_UB_PATCH = "\ | ||
24 | file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ | ||
25 | file://1002-hotspot-use-correct-include-for-poll.patch \ | ||
26 | file://1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ | ||
27 | file://1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ | ||
28 | file://1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ | ||
29 | file://1006-hotspot-Zero-build-requires-disabled-warnings.patch \ | ||
30 | file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ | ||
31 | file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \ | ||
32 | file://1009-hotspot-handle-format-error-for-GCC-7.patch \ | ||
33 | " | ||
34 | HOTSPOT_UB_PATCH_append_class-target = "\ | ||
35 | file://1010-hotspot-fix-adlc-flags.patch \ | ||
36 | file://1011-hotspot-fix-shark-build-common.patch \ | ||
37 | file://1012-hotspot-restrict-to-staging-dir.patch \ | ||
38 | " | ||
39 | HOTSPOT_UB_PATCH_prepend_aarch64 = "\ | ||
40 | file://aarch64-hotspot-Fix-further-functions-with-a-missing.patch \ | ||
41 | " | ||
42 | HOTSPOT_UB_PATCH_append_armv7a = " file://aarch32-hotspot-fix-missing-return-values.patch" | ||
43 | HOTSPOT_UB_PATCH_append_armv7ve = " file://aarch32-hotspot-fix-missing-return-values.patch" | ||
44 | |||
45 | PATCHES_URI_append_class-target = "\ | ||
46 | ${FIX_SHARK_BUILD_PT2_PATCH} \ | ||
47 | " | ||
48 | FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" | ||
49 | FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" | ||
50 | FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" | ||
51 | |||
52 | PATCHES_URI_append_libc-musl = "\ | ||
53 | ${OBSOLETE_ISNANF_PATCH} \ | ||
54 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ | ||
55 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ | ||
56 | file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ | ||
57 | file://musl-0005-hotspot-disable-agent-build-common.patch \ | ||
58 | ${DISABLE_AGENT_BUILD_PT2} \ | ||
59 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ | ||
60 | ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ | ||
61 | file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ | ||
62 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ | ||
63 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ | ||
64 | " | ||
65 | OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" | ||
66 | OBSOLETE_ISNANF_PATCH_armv7a = "" | ||
67 | OBSOLETE_ISNANF_PATCH_armv7ve = "" | ||
68 | DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" | ||
69 | DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | ||
70 | DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | ||
71 | REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" | ||
72 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | ||
73 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | ||
74 | |||
75 | PATCHES_URI_append_libc-musl_armv7a = " file://aarch32-hotspot-remaining-musl-fixes.patch" | ||
76 | PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" | ||
77 | PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" | ||
78 | |||
79 | # remove aarch32 & aarch64 mainlined patches | ||
80 | PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" | ||
81 | PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" | ||
82 | PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" | ||
83 | |||
84 | # Name of the directory containing the compiled output | ||
85 | BUILD_DIR = "openjdk.build" | ||
86 | BUILD_DIR_ECJ = "openjdk.build-ecj" | ||
87 | |||
88 | # Force arm mode for now | ||
89 | ARM_INSTRUCTION_SET_armv4t = "ARM" | ||
90 | |||
91 | # readdir_r was deprecated in glibc-2.24. Ignore the error for now | ||
92 | # NOTE: When updating the recipe, please check if this is still needed | ||
93 | BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations" | ||
94 | TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" | ||
95 | |||
96 | # WORKAROUND: disable the "specified bound depends on the length of the source argument" | ||
97 | # compiler error until we update openjdk8 to a fixed version | ||
98 | BUILD_CFLAGS_append = " -Wno-error=stringop-overflow" | ||
99 | TARGET_CFLAGS_append = " -Wno-error=stringop-overflow" | ||
100 | |||
101 | # Enable zero mode for arm based builds, as normal hotspot fails to build | ||
102 | PACKAGECONFIG_append_armv4 = " zero" | ||
103 | PACKAGECONFIG_append_armv5 = " zero" | ||
104 | PACKAGECONFIG_append_armv6 = " zero" | ||
105 | |||
106 | OPENJDK_ARCH_PORT = "jdk8u" | ||
107 | OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" | ||
108 | OPENJDK_ARCH_PORT_armv7a = "aarch32-port" | ||
109 | OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" | ||
110 | OPENJDK_HG_U = "jdk8u" | ||
111 | |||
112 | # the aarch64 port moved, for more information see: | ||
113 | # https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html | ||
114 | OPENJDK_HG_U_aarch64 = "jdk8u-shenandoah" | ||
115 | |||
116 | OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | ||
117 | |||
118 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" | ||
119 | OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" | ||
120 | OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};downloadfilename=${OPENJDK_FILE_LOCAL};name=openjdk" | ||
121 | |||
122 | HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" | ||
123 | HOTSPOT_FILE_LOCAL = "openjdk8-${PV}-hotspot-${HOTSPOT_FILE}" | ||
124 | HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};downloadfilename=${HOTSPOT_FILE_LOCAL};name=hotspot;unpack=false" | ||
125 | |||
126 | CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" | ||
127 | CORBA_FILE_LOCAL = "openjdk8-${PV}-corba-${CORBA_FILE}" | ||
128 | CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};downloadfilename=${CORBA_FILE_LOCAL};name=corba;unpack=false" | ||
129 | |||
130 | JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" | ||
131 | JAXP_FILE_LOCAL = "openjdk8-${PV}-jaxp-${JAXP_FILE}" | ||
132 | JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};downloadfilename=${JAXP_FILE_LOCAL};name=jaxp;unpack=false" | ||
133 | |||
134 | JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" | ||
135 | JAXWS_FILE_LOCAL = "openjdk8-${PV}-jaxws-${JAXWS_FILE}" | ||
136 | JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};downloadfilename=${JAXWS_FILE_LOCAL};name=jaxws;unpack=false" | ||
137 | |||
138 | JDK_FILE = "${JDK_CHANGESET}.tar.bz2" | ||
139 | JDK_FILE_LOCAL = "openjdk8-${PV}-jdk-${JDK_FILE}" | ||
140 | JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};downloadfilename=${JDK_FILE_LOCAL};name=jdk;unpack=false" | ||
141 | |||
142 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" | ||
143 | LANGTOOLS_FILE_LOCAL = "openjdk8-${PV}-langtools-${LANGTOOLS_FILE}" | ||
144 | LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};downloadfilename=${LANGTOOLS_FILE_LOCAL};name=langtools;unpack=false" | ||
145 | |||
146 | NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" | ||
147 | NASHORN_FILE_LOCAL = "openjdk8-${PV}-nashorn-${NASHORN_FILE}" | ||
148 | NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};downloadfilename=${NASHORN_FILE_LOCAL};name=nashorn;unpack=false" | ||