diff options
76 files changed, 1116 insertions, 578 deletions
@@ -73,7 +73,6 @@ way is to add the following configuration to your local.conf: SANITY_TESTED_DISTROS = "" INHERIT += "testimage" -TESTIMAGE_AUTO = "1" Then you should be able to use the open{jre,jdk}-{7,8}-test-image recipes. Furthermore you could also include the tests provided in lib/oeqa/runtime/cases @@ -110,6 +109,19 @@ list at openembedded-devel@lists.openembedded.org. Usage instructions ------------------ +Simply rely on openjdk-7-jre, openjdk-7, openjdk-8 or openjre-8. + +For conf/bblayers.conf you have to add + +BBLAYERS ?= " \ + ... + path_to_source/meta-openembedded/meta-oe \ + path_to_source/sources/meta-java \ + " + +Extra usage instructions OpenJDK-7 & OpenJDK-8 +---------------------------------------------- + You should define at least the following variables in a distro include file or local.conf # Possible provider: cacao-initial-native and jamvm-initial-native @@ -121,15 +133,13 @@ PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" # Optional since there is only one provider for now PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" -Simply rely on openjdk-7-jre, openjdk-7, openjdk-8 or openjre-8. +Extra usage instructions OpenJDK-14 +----------------------------------- -For conf/bblayers.conf you have to add +You should define at least the following variables in a distro include file or local.conf -BBLAYERS ?= " \ - ... - path_to_source/meta-openembedded/meta-oe \ - path_to_source/sources/meta-java \ - " +# The boot-jdk used to bootstrap openjdk-14-native (needs to be jdk v13 || v14) +OPENJDK14_BOOT_JDK = "/path/to/boot-jdk" Build host dependencies ----------------------- diff --git a/conf/layer.conf b/conf/layer.conf index 294c319..6a98adb 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-java" BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-java = "10" -LAYERSERIES_COMPAT_meta-java = "dunfell" +LAYERSERIES_COMPAT_meta-java = "dunfell gatesgarth" LAYERDEPENDS_meta-java += "openembedded-layer" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/docs/bootstrap-flow.txt b/docs/bootstrap-flow.md index 602eab7..96d18e6 100644 --- a/docs/bootstrap-flow.txt +++ b/docs/bootstrap-flow.md @@ -1,3 +1,11 @@ +# meta-java OpenJDK bootstrap workflow # + +## OpenJDK-14 ## + + * TODO + +## OpenJDK-7 and OpenJDK-8 ## + * first jikes-native is compiled * a Java 1.4-capable compiler that does not need a runtime or (strictly) a class library to work diff --git a/docs/update8checksums.sh b/docs/update8checksums.sh index 476841b..ccf68d1 100755 --- a/docs/update8checksums.sh +++ b/docs/update8checksums.sh @@ -31,7 +31,7 @@ COMMON_TAG="jdk8u${OPENJDK_UPDATE}-ga" AARCH32_BASEURL="https://hg.openjdk.java.net/aarch32-port/jdk8u" AARCH32_CHANGESET_ID="$(grep "^CHANGESET_ID" recipes-core/openjdk/openjdk-8-release-aarch32.inc | cut -d= -f2 | tr -d \")" -AARCH32_TAG="jdk8u${OPENJDK_UPDATE}-ga-aarch32-${AARCH32_CHANGESET_ID}" +AARCH32_TAG="jdk8u${OPENJDK_UPDATE}-${AARCH32_CHANGESET_ID}" AARCH64_BASEURL="https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" AARCH64_CHANGESET_ID="$(grep "^CHANGESET_ID" recipes-core/openjdk/openjdk-8-release-aarch64.inc | cut -d= -f2 | tr -d \")" diff --git a/lib/oeqa/runtime/cases/java.py b/lib/oeqa/runtime/cases/java.py index c1e1498..efee6e1 100644 --- a/lib/oeqa/runtime/cases/java.py +++ b/lib/oeqa/runtime/cases/java.py @@ -69,12 +69,12 @@ class JavaTest(OERuntimeTestCase): # As OpenJDK-8 doesn't support compiled mode (JIT) for arm yet we skip this # test for now. - @OEHasPackage(["openjre-8", "openjdk-8"]) + @OEHasPackage(["!openjdk-7-jre", "!openjdk-7"]) @OETestDepends(['java.JavaTest.test_java_exists']) @skipIfInDataVar('TUNE_FEATURES', 'armv4', 'OpenJDK 8 compiled mode not yet supported for armv4') @skipIfInDataVar('TUNE_FEATURES', 'armv5', 'OpenJDK 8 compiled mode not yet supported for armv5') @skipIfInDataVar('TUNE_FEATURES', 'armv6', 'OpenJDK 8 compiled mode not yet supported for armv6') - def test_java8_jar_comp_mode(self): + def test_java_jar_comp_mode(self): status, output = self.target.run('java -showversion -Xcomp -jar /tmp/test.jar') msg = 'Exit status was not 0. Output: %s' % output self.assertEqual(status, 0, msg=msg) diff --git a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch b/recipes-core/cacao/cacao/0001-java.in-Do-not-use-hardcode-paths.patch index 665377b..521814e 100644 --- a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch +++ b/recipes-core/cacao/cacao/0001-java.in-Do-not-use-hardcode-paths.patch @@ -1,25 +1,31 @@ -java.in: Do not use hardcode paths +From 51a63cdac93caf69d1b6ace40f73f6147ba37de5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> +Date: Thu, 20 Aug 2020 13:48:38 +0200 +Subject: [PATCH 1/2] java.in: Do not use hardcode paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Cacao uses hardcoded paths to various files, if these paths are not provided. This causes issues when sharing sstate with otherwise identical workers, if build time paths are not identical. -Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> - Upstream-Status: Inappropriate [Yocto-specific fixes] +Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - cacao-1.6.1/src/scripts/java.in | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + src/scripts/java.in | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) -diff --git cacao-1.6.1/src/scripts/java.in cacao-1.6.1/src/scripts/java.in -index 0790f02..2118de7 100644 ---- cacao-1.6.1/src/scripts/java.in -+++ cacao-1.6.1/src/scripts/java.in -@@ -22,5 +22,17 @@ +diff --git a/src/scripts/java.in b/src/scripts/java.in +index 0790f0255..a4f16ecdc 100644 +--- a/src/scripts/java.in ++++ b/src/scripts/java.in +@@ -22,5 +22,16 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301, USA. - + -IFS="" -exec $(dirname ${0})/cacao ${1+"$@"} +SH_DIR=`dirname "$0"` @@ -35,7 +41,6 @@ index 0790f02..2118de7 100644 +export BOOTCLASSPATH="${PARENT_DIR}/share/cacao/vm.zip:${PARENT_DIR}/share/classpath/glibj.zip" +LIBRARY_PATH="-Djava.library.path=${PARENT_DIR}/lib/classpath" +exec ${REAL_DIR}/cacao ${LIBRARY_PATH} ${1+"$@"} -+ --- -2.7.4 +-- +2.28.0 diff --git a/recipes-core/cacao/cacao-2d6f6c14daf9/system-boehm-gc.patch b/recipes-core/cacao/cacao/0002-cacao-use-system-s-boehm-garbage-collector.patch index c30f5be..102e9a7 100644 --- a/recipes-core/cacao/cacao-2d6f6c14daf9/system-boehm-gc.patch +++ b/recipes-core/cacao/cacao/0002-cacao-use-system-s-boehm-garbage-collector.patch @@ -1,4 +1,7 @@ -cacao: use system's boehm garbage collector +From 7833101c8c8938d58a32e355b9af1b56e4229a87 Mon Sep 17 00:00:00 2001 +From: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> +Date: Thu, 20 Aug 2020 13:50:47 +0200 +Subject: [PATCH 2/2] cacao: use system's boehm garbage collector This is a Gentoo's patch [1] to force the use of system's bdwgc. @@ -10,11 +13,17 @@ with the system's version. Upstream-Status: Inappropriate [not author] Signed-off-by: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + configure.ac | 8 ++------ + src/mm/Makefile.am | 9 ++++----- + 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac +index aceb2033b..db8a9770e 100644 --- a/configure.ac +++ b/configure.ac -@@ -691,6 +691,8 @@ +@@ -738,6 +738,8 @@ AC_CHECK_ENABLE_GCC_PR40134 AC_CHECK_ENABLE_PIC_ASM @@ -23,7 +32,7 @@ diff --git a/configure.ac b/configure.ac dnl Define version numbers. AC_VERSION_DETAIL AC_VERSION_CONFIG -@@ -793,12 +795,6 @@ +@@ -855,12 +857,6 @@ AC_CONFIG_FILES([Makefile] ) @@ -37,9 +46,10 @@ diff --git a/configure.ac b/configure.ac diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am +index 9d0945a29..cbd7dc963 100644 --- a/src/mm/Makefile.am +++ b/src/mm/Makefile.am -@@ -35,14 +35,13 @@ +@@ -35,14 +35,13 @@ GC_FILE = \ endif if ENABLE_GC_BOEHM @@ -58,3 +68,6 @@ diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am endif if ENABLE_GC_CACAO +-- +2.28.0 + diff --git a/recipes-core/cacao/cacao_2d6f6c14daf9.bb b/recipes-core/cacao/cacao_git.bb index 0e50b68..1a61e12 100644 --- a/recipes-core/cacao/cacao_2d6f6c14daf9.bb +++ b/recipes-core/cacao/cacao_git.bb @@ -10,14 +10,12 @@ PROVIDES_class-native = "virtual/java-native" DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc" RPROVIDES_${PN} = "java2-runtime" -SRC_URI = "https://bitbucket.org/cacaovm/cacao-staging/get/${PV}.zip \ - file://system-boehm-gc.patch \ - file://cacao-1.6.1-do-not-rely-on-absolute-paths.patch \ +SRCREV = "6c4694f9bd175386a8c451531e9a5ad97aa23b6f" +SRC_URI = "git://bitbucket.org/cacaovm/cacao.git;protocol=https \ + file://0001-java.in-Do-not-use-hardcode-paths.patch \ + file://0002-cacao-use-system-s-boehm-garbage-collector.patch \ " -S = "${WORKDIR}/cacaovm-cacao-staging-${PV}" - -SRC_URI[md5sum] = "5157d0bb9eb1332f7a6b6186eaac01aa" -SRC_URI[sha256sum] = "34b51d660d69c2a83225fd75eab5e1fac002fb5974cb4a74b7478baf923a76cd" +S = "${WORKDIR}/git" inherit java autotools-brokensep update-alternatives pkgconfig features_check diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index a5daa7c..5351fe1 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -66,37 +66,35 @@ B = "${S}/build" # openjdk looks in /usr/include and /usr/lib for freetype by default. export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" +export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" # libfreetype.so.6 is copied from STAGING_LIBDIR # which is already stripped. INSANE_SKIP_${PN} = "already-stripped" EXTRA_OECONF = "\ - --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ - \ - --disable-tests \ - --disable-hotspot-tests \ - --disable-langtools-tests \ - --disable-jdk-tests \ - --disable-pulse-java \ - --disable-docs \ - --disable-nss \ - --disable-system-lcms \ - --disable-system-gtk \ - \ - --with-jdk-home=${WORKDIR}/fake-jdk \ - --with-javac=${STAGING_BINDIR_NATIVE}/javac \ - --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ - \ - --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE} \ - --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE} \ - --with-corba-src-zip=${DL_DIR}/${CORBA_FILE} \ - --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE} \ - --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \ - --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \ - --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \ - ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ - " + --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ + --disable-tests \ + --disable-hotspot-tests \ + --disable-langtools-tests \ + --disable-jdk-tests \ + --disable-pulse-java \ + --disable-docs \ + --disable-nss \ + --disable-system-lcms \ + --disable-system-gtk \ + --with-jdk-home=${WORKDIR}/fake-jdk \ + --with-javac=${STAGING_BINDIR_NATIVE}/javac \ + --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ + --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE_DOWNLOAD} \ + --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE_DOWNLOAD} \ + --with-corba-src-zip=${DL_DIR}/${CORBA_FILE_DOWNLOAD} \ + --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE_DOWNLOAD} \ + --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE_DOWNLOAD} \ + --with-jdk-src-zip=${DL_DIR}/${JDK_FILE_DOWNLOAD} \ + --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE_DOWNLOAD} \ + ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ +" JDK_DIR = "icedtea7-native" diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch new file mode 100644 index 0000000..1c7a585 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch @@ -0,0 +1,22 @@ +--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c +@@ -35,7 +35,7 @@ + #endif + #ifdef __linux__ + #include <unistd.h> +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #include <sys/utsname.h> + #include <netinet/ip.h> + +--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c +@@ -43,7 +43,7 @@ + #endif + #ifdef __linux__ + #include <unistd.h> +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #endif + + #include "jvm.h" diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index 9816c0c..627501c 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc @@ -13,50 +13,58 @@ ICEDTEA_PREFIX = "icedtea7-forest-2.1" ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}" OPENJDK_CHANGESET = "22cc03983e20" -OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" -OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false" +OPENJDK_FILE_UPSTREAM = "${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_FILE_DOWNLOAD = "openjdk-${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE_UPSTREAM};name=openjdk;unpack=false;downloadfilename=${OPENJDK_FILE_DOWNLOAD}" SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb" SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e" HOTSPOT_CHANGESET = "8b7c4c5f6ba9" -HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz" -HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" +HOTSPOT_FILE_UPSTREAM = "${HOTSPOT_CHANGESET}.tar.gz" +HOTSPOT_FILE_DOWNLOAD = "hotspot-${HOTSPOT_CHANGESET}.tar.gz" +HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE_UPSTREAM};name=hotspot;unpack=false;downloadfilename=${HOTSPOT_FILE_DOWNLOAD}" SRC_URI[hotspot.md5sum] = "cb45a8f19d77acc1f4f48e75e36a27fe" SRC_URI[hotspot.sha256sum] = "22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2" CORBA_CHANGESET = "5617f6c5cc94" -CORBA_FILE = "${CORBA_CHANGESET}.tar.gz" -CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" +CORBA_FILE_UPSTREAM = "${CORBA_CHANGESET}.tar.gz" +CORBA_FILE_DOWNLOAD = "corba-${CORBA_CHANGESET}.tar.gz" +CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE_UPSTREAM};name=corba;unpack=false;downloadfilename=${CORBA_FILE_DOWNLOAD}" SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251" SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3" JAXP_CHANGESET = "7a8825b15df6" -JAXP_FILE = "${JAXP_CHANGESET}.tar.gz" -JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" +JAXP_FILE_UPSTREAM = "${JAXP_CHANGESET}.tar.gz" +JAXP_FILE_DOWNLOAD = "jaxp-${JAXP_CHANGESET}.tar.gz" +JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE_UPSTREAM};name=jaxp;unpack=false;downloadfilename=${JAXP_FILE_DOWNLOAD}" SRC_URI[jaxp.md5sum] = "a0982b6df79739127871e355a40ca5a6" SRC_URI[jaxp.sha256sum] = "297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2" JAXWS_CHANGESET = "7edfbfe974f2" -JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz" -JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" +JAXWS_FILE_UPSTREAM = "${JAXWS_CHANGESET}.tar.gz" +JAXWS_FILE_DOWNLOAD = "jaxws-${JAXWS_CHANGESET}.tar.gz" +JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE_UPSTREAM};name=jaxws;unpack=false;downloadfilename=${JAXWS_FILE_DOWNLOAD}" SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac" SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa" JDK_CHANGESET = "d5ddeffc4651" -JDK_FILE = "${JDK_CHANGESET}.tar.gz" -JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" +JDK_FILE_UPSTREAM = "${JDK_CHANGESET}.tar.gz" +JDK_FILE_DOWNLOAD = "jdk-${JDK_CHANGESET}.tar.gz" +JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE_UPSTREAM};name=jdk;unpack=false;downloadfilename=${JDK_FILE_DOWNLOAD}" SRC_URI[jdk.md5sum] = "27c28d6be213df818490e69f12efe475" SRC_URI[jdk.sha256sum] = "e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98" LANGTOOLS_CHANGESET = "b534c4c6cd9b" -LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz" -LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" +LANGTOOLS_FILE_UPSTREAM = "${LANGTOOLS_CHANGESET}.tar.gz" +LANGTOOLS_FILE_DOWNLOAD = "langtools-${LANGTOOLS_CHANGESET}.tar.gz" +LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE_UPSTREAM};name=langtools;unpack=false;downloadfilename=${LANGTOOLS_FILE_DOWNLOAD}" SRC_URI[langtools.md5sum] = "16b72f3fea8ac4e5b50de693e87f9c53" SRC_URI[langtools.sha256sum] = "c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c" CACAO_VERSION = "a567bcb7f589" -CACAO_FILE = "${CACAO_VERSION}.tar.gz" -CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false" +CACAO_FILE_UPSTREAM = "${CACAO_VERSION}.tar.gz" +CACAO_FILE_DOWNLOAD = "cacao-${CACAO_VERSION}.tar.gz" +CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE_UPSTREAM};name=cacao;unpack=false;downloadfilename=${CACAO_FILE_DOWNLOAD}" SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73" SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9" @@ -93,6 +101,7 @@ OPENJDK_PATCHES = " \ file://icedtea-jdk-unzip.patch;apply=no \ file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \ file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \ + file://icedtea-jdk-replace-sys-sysctl.patch;apply=no \ " OPENJDK_HEADLESS_PATCHES = " \ @@ -118,6 +127,7 @@ export DISTRIBUTION_PATCHES = " \ patches/icedtea-jdk-unzip.patch \ patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \ patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \ + patches/icedtea-jdk-replace-sys-sysctl.patch \ ${CLEAN_X11_DISTRIBUTION_PATCH} \ " diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb index b8f9ffb..3c14e4c 100644 --- a/recipes-core/jlex/jlex_1.2.6.bb +++ b/recipes-core/jlex/jlex_1.2.6.bb @@ -1,7 +1,9 @@ SUMMARY = "Lexical analyzer generator for Java" AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian" + +JLEX_MAIN_FILENAME = "jlex-${PV}-Main.java" LICENSE = "JLEX" -LIC_FILES_CHKSUM = "file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a" +LIC_FILES_CHKSUM = "file://${JLEX_MAIN_FILENAME};beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a" PACKAGE_ARCH = "${TUNE_PKGARCH}" @@ -10,7 +12,7 @@ RDEPENDS_${PN}_class-native = "" inherit java-library -SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Main.java \ +SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Main.java;downloadfilename=${JLEX_MAIN_FILENAME} \ file://jlex \ " @@ -26,6 +28,7 @@ do_configure() { do_compile() { mkdir -p build + cp ${JLEX_MAIN_FILENAME} Main.java javac -d build Main.java diff --git a/recipes-core/openjdk/openjdk-14-common.inc b/recipes-core/openjdk/openjdk-14-common.inc new file mode 100644 index 0000000..36451b8 --- /dev/null +++ b/recipes-core/openjdk/openjdk-14-common.inc @@ -0,0 +1,155 @@ +# Copyright (C) 2020 Richard Leitner <richard.leitner@skidata.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Java runtime based upon the OpenJDK Project" +HOMEPAGE = "http://openjdk.java.net/" +LICENSE = "GPL-2.0-with-classpath-exception" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f" + +DEPENDS = "\ + alsa-lib \ + bash \ + fontconfig \ + freetype \ + giflib \ + jpeg \ + libpng \ + libx11 xorgproto libxt libxext libxrender libxtst libxrandr \ + unzip-native \ + zip-native \ + zlib \ + " + +DEPENDS_append_class-target = "\ + cups \ + openjdk-14-native \ + " + +SRC_URI = "\ + https://hg.openjdk.java.net/jdk-updates/jdk14u/archive/jdk-${PV}-ga.tar.bz2;name=jdk \ + file://0001-make-autoconf-remove-hard-dependency-on-cups.patch \ + file://0002-make-autoconf-toolchain-remove-invalid-compiler-chec.patch \ + " + +S = "${WORKDIR}/jdk14u-jdk-${PV}-ga" + +require openjdk-common.inc + +JAVA_HOME = "${libdir_jvm}/${PN}" + +AUTOTOOLS_SCRIPT_PATH = "${S}/make/autoconf" + +EXTRA_OECONF_append = "\ + --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ + --with-tools-dir='${STAGING_DIR_NATIVE}' \ + --with-extra-cflags='${CFLAGS}' \ + --with-extra-cxxflags='${CXXFLAGS}' \ + --with-extra-ldflags='${LDFLAGS}' \ + --with-alsa-include='${STAGING_INCDIR}/alsa' \ + --with-alsa-lib='${STAGING_LIBDIR}' \ + --with-fontconfig-include='${STAGING_INCDIR}' \ + --with-freetype-include='${STAGING_INCDIR}/freetype2' \ + --with-freetype-lib='${STAGING_LIBDIR}' \ + --with-giflib=bundled \ + --with-libjpeg=bundled \ + --with-libpng=bundled \ + --with-zlib=bundled \ + --x-includes='${STAGING_INCDIR}/X11' \ + --x-libraries='${STAGING_LIBDIR}' \ + --with-vendor-name='meta-java' \ + --disable-manpages \ + --disable-warnings-as-errors \ + " + +CONFIGUREOPTS_remove_class-native = "--host=${HOST_SYS}" +CONFIGUREOPTS_remove_class-native = "--target=${TARGET_SYS}" + +EXTRA_OECONF_append_class-native = "\ + --with-boot-jdk='${OPENJDK14_BOOT_JDK}' \ + --enable-headless-only \ + --enable-openjdk-only \ + --without-cups \ + " + +EXTRA_OECONF_append_class-target = "\ + --with-sys-root='${STAGING_DIR_HOST}' \ + --with-boot-jdk='${STAGING_LIBDIR_NATIVE}/jvm/openjdk-14-native' \ + " + +do_patch_append() { + bb.build.exec_func('do_fix_configure', d) +} + +do_fix_configure() { + chmod a+x ${S}/configure +} + +do_configure_prepend () { + export TOPDIR=${S} + export CXXFILT="c++filt" + unset CFLAGS CXXFLAGS LDFLAGS +} + +EXTRA_OEMAKE_append = '\ + STRIP_POLICY=no_strip \ + QUIETLY= \ + jdk-image \ + legacy-jre-image \ +' + +do_install() { + rm -rf ${D}${JAVA_HOME} + mkdir -p ${D}${JAVA_HOME} + if [[ "${PN}" = openjre* ]]; then + cp -rp ${B}/images/jre/* ${D}${JAVA_HOME} + else + cp -rp ${B}/images/jdk/* ${D}${JAVA_HOME} + fi + chown -R root:root ${D}${JAVA_HOME} + #install -m644 ${WORKDIR}/jvm.cfg ${D}${JAVA_HOME}/jre/lib/${JDK_ARCH}/ + find ${D}${JAVA_HOME} -name "*.debuginfo" -exec rm {} \; +} + +PACKAGES_append = " \ + ${PN}-demo \ + ${PN}-jmods \ +" + +FILES_${PN}-demo = " ${JAVA_HOME}/demo ${JAVA_HOME}/sample " +FILES_${PN}-jmods = " ${JAVA_HOME}/jmods " + +FILES_${PN}_append = "\ + ${JAVA_HOME}/bin/[a-z]* \ + ${JAVA_HOME}/lib/[a-z]* \ + ${JAVA_HOME}/jre/bin/[a-z]* \ + ${JAVA_HOME}/jre/lib/[a-z]* \ + ${JAVA_HOME}/LICENSE \ + ${JAVA_HOME}/jre/LICENSE \ + ${JAVA_HOME}/release \ + ${JAVA_HOME}/conf \ +" + +FILES_${PN}-dev_append = "\ + ${JAVA_HOME}/include \ +" + +FILES_${PN}-doc_append = "\ + ${JAVA_HOME}/man \ + ${JAVA_HOME}/ASSEMBLY_EXCEPTION \ + ${JAVA_HOME}/THIRD_PARTY_README \ + ${JAVA_HOME}/jre/ASSEMBLY_EXCEPTION \ + ${JAVA_HOME}/jre/THIRD_PARTY_README \ + ${JAVA_HOME}/legal \ +" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_openjdk-14 = "java javac" +ALTERNATIVE_openjre-14 = "java" +ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" +ALTERNATIVE_TARGET[java] = "${JAVA_HOME}/bin/java" +ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" +ALTERNATIVE_TARGET[javac] = "${JAVA_HOME}/bin/javac" diff --git a/recipes-core/openjdk/openjdk-14-release.inc b/recipes-core/openjdk/openjdk-14-release.inc new file mode 100644 index 0000000..33b3966 --- /dev/null +++ b/recipes-core/openjdk/openjdk-14-release.inc @@ -0,0 +1,12 @@ +# Copyright (C) 2020 Richard Leitner <richard.leitner@skidata.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SRC_URI[jdk.sha256sum] = "f9c4a55ac858f858222bc5fe6e4b890f9b4a3f942fd0211575b0418aec5c14d6" + +FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-14:" + +SRC_URI_append = "\ + file://libjava_childproc_multiple_definition_link_errors_with_GCC10.patch \ + file://libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch \ + file://fixed_libsctp_link_errors_caused_by_GCC10.patch \ + " diff --git a/recipes-core/openjdk/openjdk-14_14.0.1.bb b/recipes-core/openjdk/openjdk-14_14.0.1.bb new file mode 100644 index 0000000..f94b25a --- /dev/null +++ b/recipes-core/openjdk/openjdk-14_14.0.1.bb @@ -0,0 +1,7 @@ +# Copyright (C) 2020 Richard Leitner <richard.leitner@skidata.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +require openjdk-14-common.inc +require openjdk-14-release.inc + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 04acc59..70585a6 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -111,10 +111,7 @@ def package_config_option_cleanup(d): if not option_headless and not with_cups: option_headless = True - if not option_soundless and not with_alsa: - option_soundless = True - - if not option_soundless and not with_pulseaudio: + if not option_soundless and not with_pulseaudio and not with_alsa: option_soundless = True options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] } diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index 24b6f20..92d9473 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -88,3 +88,6 @@ do_install() { ln -sf "../lib/jvm/${JDK_DIR}/bin/$tool" ${D}${bindir}/$tool done } + +# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped +INSANE_SKIP_${PN} = "already-stripped" diff --git a/recipes-core/openjdk/openjdk-8-native_252.bb b/recipes-core/openjdk/openjdk-8-native_272.bb index 39321f2..39321f2 100644 --- a/recipes-core/openjdk/openjdk-8-native_252.bb +++ b/recipes-core/openjdk/openjdk-8-native_272.bb diff --git a/recipes-core/openjdk/openjdk-8-release-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-aarch32.inc index 62dc866..700a0f5 100644 --- a/recipes-core/openjdk/openjdk-8-release-aarch32.inc +++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc @@ -4,31 +4,31 @@ COMPATIBLE_HOST = "^$" COMPATIBLE_HOST_armv7a = "arm" COMPATIBLE_HOST_armv7ve = "arm" -CHANGESET_ID="20200415" +CHANGESET_ID="b09-aarch32-20200929" -CORBA_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[corba.sha256sum] = "e8dab3ffbc39fec724604b8c65408f32dcca1682769077c5b4f71b571938fe26" +CORBA_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741" -HOTSPOT_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[hotspot.sha256sum] = "7aebf690a05746e4fbcdcd75ac4e67acb2f0b087bba3bcb064675468626f5822" +HOTSPOT_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81" -JAXP_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[jaxp.sha256sum] = "44883e0e836ee5fa2fcb4df936bafcfad69c57d05876d44ecefc5b3cb6b085c0" +JAXP_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e" -JAXWS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[jaxws.sha256sum] = "34f6cf3eb34c0c310e0cc31b876b189fd6b2e2c2dcc1066af5347f3a0873d2d3" +JAXWS_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f" -JDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[jdk.sha256sum] = "f89688b5673ed75b1bebfd530a979788a4cbe942ce39eb38784f8c9e1303012b" +JDK_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe" -LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[langtools.sha256sum] = "18357720e3b924dea2f171235ae06e753aeef7958a3ce7a2a8d41fa6e2c90454" +LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f" -NASHORN_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[nashorn.sha256sum] = "abd6ccf28278ce5775eebada339228fe2e3380d57d009179acdd7026adb21448" +NASHORN_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223" -OPENJDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}" -SRC_URI[openjdk.sha256sum] = "06d141aa01b80aa0c167167081e2139b3edf5af764cf17bbe9e1b57bf4f585ab" +OPENJDK_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" +SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a" PACKAGECONFIG_append_armv7a = " client" PACKAGECONFIG_append_armv7ve = " client" diff --git a/recipes-core/openjdk/openjdk-8-release-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-aarch64.inc index 86dffff..c71dd25 100644 --- a/recipes-core/openjdk/openjdk-8-release-aarch64.inc +++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc @@ -2,28 +2,28 @@ require openjdk-8-release-common.inc COMPATIBLE_HOST = "aarch64" -CHANGESET_ID="b09" +CHANGESET_ID="b10" CORBA_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[corba.sha256sum] = "13ce2345dec4390a7ed61066275528c1d4fe246abb3ffc16bdfd93c0e8ead193" +SRC_URI[corba.sha256sum] = "112143d935a94cb95a0f9dba19a86184d08e699a68a82db58cdd9f0de1baeeae" HOTSPOT_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[hotspot.sha256sum] = "80dd8b1289905252f5f9d97ba2302fe4b77a76851709f10d429848750b709c66" +SRC_URI[hotspot.sha256sum] = "16ed30b46279e2ffef04ab392502e32525451bea38f3af0d3c3782bcd33a0274" JAXP_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[jaxp.sha256sum] = "a52f5497318980f379ce05ff8e638a0ae0ce7265d8922ddfb731d26989faf161" +SRC_URI[jaxp.sha256sum] = "5dde165d7327b08f2ebc8d3081a1734d9ef737117dcaa417eb7dc39344220987" JAXWS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[jaxws.sha256sum] = "1db8876408222a8eec8432bd9778559ea80cae36a2c6dead32723279d1622741" +SRC_URI[jaxws.sha256sum] = "cedde28264a85cb16ae46123091edb64f7c1d2cd5f3de6ba0d21cffff84c3ccf" JDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[jdk.sha256sum] = "abc7a1eec87ac330bebfa8ec4a3db72c27b63aa50175abfade580a46b7f2d865" +SRC_URI[jdk.sha256sum] = "7e53438e0506536fe373b7f8176512c701b87adda268831d180ead2695154a93" LANGTOOLS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[langtools.sha256sum] = "c4e3dd471372dad5a545ec038104c7706fa02da452275ce118ad7e38e418a57a" +SRC_URI[langtools.sha256sum] = "8dbcd45109d0c782a6cac5a1a310a5816d4dac8a9c095635832ab803bfdb861a" NASHORN_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[nashorn.sha256sum] = "956ef3a52dc97fb28aeeeb9ccbd371c2b7f14e253fd63d1f98bb1bf87ddf1929" +SRC_URI[nashorn.sha256sum] = "85497cdba0943644d838862761891d0a06dfaad5ea13b63af69f1a6d595e6387" OPENJDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" -SRC_URI[openjdk.sha256sum] = "b7b933ff2b8c0ee17eb6dbd02beb8769e7dfe15c50ab2fdeef55666e4b12cbe7" +SRC_URI[openjdk.sha256sum] = "97175c78de4c82b78d3c80b1b0d22c44b195ca067f253cfaa3c235328b808760" diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc index 02210a1..a3747cf 100644 --- a/recipes-core/openjdk/openjdk-8-release-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-common.inc @@ -19,37 +19,33 @@ PATCHES_URI = "\ file://2006-jdk-disable-backtrace-musl-build-fix.patch \ file://2007-jdk-no-genx11-in-headless.patch \ file://2008-jdk-no-unused-deps.patch \ - file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \ + file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch \ " HOTSPOT_UB_PATCH = "\ file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ file://1002-hotspot-use-correct-include-for-poll.patch \ file://1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ - file://1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ - file://1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ - file://1006-hotspot-Zero-build-requires-disabled-warnings.patch \ - file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ - file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \ - file://1009-hotspot-handle-format-error-for-GCC-7.patch \ - file://1013-hotspot-make-disable-Werror.patch \ + file://1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ + file://1005-hotspot-Zero-build-requires-disabled-warnings.patch \ + file://1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ + file://1007-hotspot-Turn-on-the-Wreturn-type-warning.patch \ + file://1008-hotspot-handle-format-error-for-GCC-7.patch \ + file://1012-hotspot-enable-Wno-error.patch \ " HOTSPOT_UB_PATCH_append_class-target = "\ - file://1010-hotspot-fix-adlc-flags.patch \ - file://1011-hotspot-fix-shark-build-common.patch \ - file://1012-hotspot-restrict-to-staging-dir.patch \ + file://1009-hotspot-fix-adlc-flags.patch \ + file://1010-hotspot-fix-shark-build-common.patch \ + file://1011-hotspot-restrict-to-staging-dir.patch \ " HOTSPOT_UB_PATCH_prepend_aarch64 = "\ - file://aarch64-hotspot-Fix-further-functions-with-a-missing.patch \ + file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \ " -HOTSPOT_UB_PATCH_append_armv7a = " file://aarch32-hotspot-fix-missing-return-values.patch" -HOTSPOT_UB_PATCH_append_armv7ve = " file://aarch32-hotspot-fix-missing-return-values.patch" +HOTSPOT_UB_PATCH_append_armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" +HOTSPOT_UB_PATCH_append_armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" PATCHES_URI_append_class-target = "\ - ${FIX_SHARK_BUILD_PT2_PATCH} \ + file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \ " -FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" -FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" -FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0" PATCHES_URI_append_libc-musl = "\ ${OBSOLETE_ISNANF_PATCH} \ @@ -74,14 +70,14 @@ REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc- REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" -PATCHES_URI_append_libc-musl_armv7a = " file://aarch32-hotspot-remaining-musl-fixes.patch" -PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" -PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" +PATCHES_URI_append_libc-musl_armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" +PATCHES_URI_append_libc-musl_armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" +PATCHES_URI_append_libc-musl_aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch" # remove aarch32 & aarch64 mainlined patches -PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" -PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" -PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" +PATCHES_URI_remove_armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" +PATCHES_URI_remove_armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" +PATCHES_URI_remove_aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" # Name of the directory containing the compiled output BUILD_DIR = "openjdk.build" diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc index ddbd8c9..28429f8 100644 --- a/recipes-core/openjdk/openjdk-8-release.inc +++ b/recipes-core/openjdk/openjdk-8-release.inc @@ -7,25 +7,25 @@ COMPATIBLE_HOST_armv7a = "^$" COMPATIBLE_HOST_armv7ve = "^$" CORBA_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[corba.sha256sum] = "97513397015ca62953c6afa3ba925b1dabc0238d47f3a2b81c2bd5b683d4d050" +SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138" HOTSPOT_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[hotspot.sha256sum] = "80a91f421bbe750f5e8c66b74f77fb79f31cce2f6e9e1cfe8407d773bb1ed57d" +SRC_URI[hotspot.sha256sum] = "55db6eb423445978e5a9a285c5adea238dec3d3998dc5f1216f8f5c7a8d7c5ea" JAXP_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[jaxp.sha256sum] = "ead123b56c1c5d4c381665da6c0858cd9b11c69b8afc7494f9831980bc71bc92" +SRC_URI[jaxp.sha256sum] = "778d3946b9cf84c9b7fd937dc91d0e919ba7616cc4e3db44b9d0347ecdad308a" JAXWS_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[jaxws.sha256sum] = "ef6532ac77e7e4333283c09c87b6923fbaa91b8bca6770f06494c3bb1643455e" +SRC_URI[jaxws.sha256sum] = "a46eabbed4fedcdbd26510fc1ccf40aaa337e44542f112d4dba3e93f2bb7e492" JDK_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[jdk.sha256sum] = "7203ded24a10843ac8e84269ad8ac347f29b1dd950f7e0bb9739ddcb8280b8fb" +SRC_URI[jdk.sha256sum] = "9913adf85d3c5b039a5dfeb0962613d92c6f454d0bbbbe3e5341e221021e908e" LANGTOOLS_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[langtools.sha256sum] = "6e2329e3f15c0fd23da47cd8f454cb49cdae0b12c951eb2910061fa95acb8ea4" +SRC_URI[langtools.sha256sum] = "9189920ae3858c9a680912c54504302e0553cf25d892c8a03fe954859f587066" NASHORN_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[nashorn.sha256sum] = "195237fd89f34c27bf98c3a8bfda64bbc799a014e83907062a8b4e10bd4f2021" +SRC_URI[nashorn.sha256sum] = "b42bed287349ecc702f874867a60c3e3664a799d69004e46260db5ff9a7df772" OPENJDK_CHANGESET = "jdk8u${PV}-ga" -SRC_URI[openjdk.sha256sum] = "a83f8daa2afece63bf7ae95cfbca91ef765424c40b9f5b45e4a3c2d4da0f7a95" +SRC_URI[openjdk.sha256sum] = "3b335df278915237986ccdfc40e262d5b6a711072b2a0b99bf2b197dc9ff0cff" diff --git a/recipes-core/openjdk/openjdk-8_252.bb b/recipes-core/openjdk/openjdk-8_272.bb index bc6ce51..f9049e5 100644 --- a/recipes-core/openjdk/openjdk-8_252.bb +++ b/recipes-core/openjdk/openjdk-8_272.bb @@ -53,9 +53,12 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "java javac" +ALTERNATIVE_${PN} = "java javac keytool" ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" + +ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" +ALTERNATIVE_TARGET[keytool] = "${JDK_HOME}/bin/keytool" diff --git a/recipes-core/openjdk/openjre-14_14.0.1.bb b/recipes-core/openjdk/openjre-14_14.0.1.bb new file mode 100644 index 0000000..04cd23e --- /dev/null +++ b/recipes-core/openjdk/openjre-14_14.0.1.bb @@ -0,0 +1,5 @@ +# Copyright (C) 2020 Richard Leitner <richard.leitner@skidata.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +require openjdk-14-common.inc +require openjdk-14-release.inc diff --git a/recipes-core/openjdk/openjre-8_252.bb b/recipes-core/openjdk/openjre-8_272.bb index ce6392a..55ca1ec 100644 --- a/recipes-core/openjdk/openjre-8_252.bb +++ b/recipes-core/openjdk/openjre-8_272.bb @@ -38,7 +38,11 @@ RPROVIDES_${PN} = "java2-runtime" inherit update-alternatives -ALTERNATIVE_${PN} = "java" +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "java keytool" ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" -ALTERNATIVE_PRIORITY[java] = "100" + +ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" +ALTERNATIVE_TARGET[keytool] = "${JRE_HOME}/bin/keytool" diff --git a/recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch b/recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch new file mode 100644 index 0000000..51999b6 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch @@ -0,0 +1,154 @@ +From 3f77089a24c5073c59321d0ac5fdfe5057d8c06b Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Wed, 13 May 2020 13:34:33 +0200 +Subject: [PATCH 1/2] make: autoconf: remove hard dependency on cups + +In our native build we don't want to have a dependency on cups, +therefore enable --without-cups for all platforms. + +Upstream-Status: Inappropriate [disable feature] +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/autoconf/lib-cups.m4 | 30 ++++++++++++------------------ + make/autoconf/libraries.m4 | 8 -------- + make/autoconf/spec.gmk.in | 1 + + make/lib/Awt2dLibraries.gmk | 13 ++++++++++++- + 4 files changed, 25 insertions(+), 27 deletions(-) + +diff --git a/make/autoconf/lib-cups.m4 b/make/autoconf/lib-cups.m4 +index 0a7df8b381..e8b6a683a3 100644 +--- a/make/autoconf/lib-cups.m4 ++++ b/make/autoconf/lib-cups.m4 +@@ -34,25 +34,18 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS], + AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include], + [specify directory for the cups include files])]) + +- if test "x$NEEDS_LIB_CUPS" = xfalse; then +- if (test "x${with_cups}" != x && test "x${with_cups}" != xno) || \ +- (test "x${with_cups_include}" != x && test "x${with_cups_include}" != xno); then +- AC_MSG_WARN([[cups not used, so --with-cups[-*] is ignored]]) +- fi ++ ++ WITH_CUPS="false" ++ if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then ++ AC_MSG_WARN([Disable the use of cups.]) + CUPS_CFLAGS= + else +- CUPS_FOUND=no +- +- if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then +- AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.]) +- fi +- + if test "x${with_cups}" != x; then + AC_MSG_CHECKING([for cups headers]) + if test -s "${with_cups}/include/cups/cups.h"; then + CUPS_CFLAGS="-I${with_cups}/include" +- CUPS_FOUND=yes +- AC_MSG_RESULT([$CUPS_FOUND]) ++ WITH_CUPS="true" ++ AC_MSG_RESULT([$WITH_CUPS]) + else + AC_MSG_ERROR([Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option.]) + fi +@@ -61,25 +54,26 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS], + AC_MSG_CHECKING([for cups headers]) + if test -s "${with_cups_include}/cups/cups.h"; then + CUPS_CFLAGS="-I${with_cups_include}" +- CUPS_FOUND=yes +- AC_MSG_RESULT([$CUPS_FOUND]) ++ WITH_CUPS="true" ++ AC_MSG_RESULT([$WITH_CUPS]) + else + AC_MSG_ERROR([Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option.]) + fi + fi +- if test "x$CUPS_FOUND" = xno; then ++ if test "x$WITH_CUPS" = "xfalse"; then + # Are the cups headers installed in the default /usr/include location? + AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [ +- CUPS_FOUND=yes ++ WITH_CUPS="true" + CUPS_CFLAGS= + DEFAULT_CUPS=yes + ]) + fi +- if test "x$CUPS_FOUND" = xno; then ++ if test "x$WITH_CUPS" = "xfalse"; then + HELP_MSG_MISSING_DEPENDENCY([cups]) + AC_MSG_ERROR([Could not find cups! $HELP_MSG ]) + fi + fi + + AC_SUBST(CUPS_CFLAGS) ++ AC_SUBST(WITH_CUPS) + ]) +diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 +index 5f16f08b20..8d64c6e8b7 100644 +--- a/make/autoconf/libraries.m4 ++++ b/make/autoconf/libraries.m4 +@@ -59,14 +59,6 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], + NEEDS_LIB_FONTCONFIG=true + fi + +- # Check if cups is needed +- if test "x$OPENJDK_TARGET_OS" = xwindows; then +- # Windows have a separate print system +- NEEDS_LIB_CUPS=false +- else +- NEEDS_LIB_CUPS=true +- fi +- + # A custom hook may have set this already + if test "x$NEEDS_LIB_FREETYPE" = "x"; then + NEEDS_LIB_FREETYPE=true +diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in +index 3a85303e80..b1253daa5d 100644 +--- a/make/autoconf/spec.gmk.in ++++ b/make/autoconf/spec.gmk.in +@@ -370,6 +370,7 @@ FREETYPE_LIBS:=@FREETYPE_LIBS@ + FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@ + FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@ + CUPS_CFLAGS:=@CUPS_CFLAGS@ ++WITH_CUPS := @WITH_CUPS@ + ALSA_LIBS:=@ALSA_LIBS@ + ALSA_CFLAGS:=@ALSA_CFLAGS@ + LIBFFI_LIBS:=@LIBFFI_LIBS@ +diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk +index a38d416673..d0eeab35c6 100644 +--- a/make/lib/Awt2dLibraries.gmk ++++ b/make/lib/Awt2dLibraries.gmk +@@ -141,7 +141,11 @@ ifeq ($(call isTargetOs, windows), true) + endif + + ifeq ($(call isTargetOs, solaris linux macosx aix), true) +- LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c ++ LIBAWT_EXFILES += awt_Font.c fontpath.c X11Color.c ++endif ++ ++ifeq ($(WITH_CUPS), false) ++ LIBAWT_EXFILES += CUPSfuncs.c + endif + + ifeq ($(call isTargetOs, macosx), true) +@@ -461,10 +465,17 @@ ifeq ($(call isTargetOs, windows macosx), false) + LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ + -DHEADLESS=true + ++ ++ LIBAWT_HEADLESS_EXFILES := ++ ifeq ($(WITH_CUPS), false) ++ LIBAWT_HEADLESS_EXFILES += CUPSfuncs.c ++ endif ++ + $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ + NAME := awt_headless, \ + EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ + EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ ++ EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(LIBAWT_HEADLESS_CFLAGS), \ +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-14/0002-make-autoconf-toolchain-remove-invalid-compiler-chec.patch b/recipes-core/openjdk/patches-openjdk-14/0002-make-autoconf-toolchain-remove-invalid-compiler-chec.patch new file mode 100644 index 0000000..9997e70 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-14/0002-make-autoconf-toolchain-remove-invalid-compiler-chec.patch @@ -0,0 +1,45 @@ +From 93a94cd79b5657bc7954a23d6d3f9eda0addf773 Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Wed, 13 May 2020 13:41:49 +0200 +Subject: [PATCH 2/2] make: autoconf: toolchain: remove invalid compiler + checking + +The checking of CC and CXX was faulty as it doesn't supported +program arguments. +To make things work remove the check and trust it is valid. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/autoconf/toolchain.m4 | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 +index 341b2d1786..24f9f03948 100644 +--- a/make/autoconf/toolchain.m4 ++++ b/make/autoconf/toolchain.m4 +@@ -526,21 +526,6 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], + if test "x[$]$1" != x; then + # User has supplied compiler name already, always let that override. + AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1]) +- if test "x`basename [$]$1`" = "x[$]$1"; then +- # A command without a complete path is provided, search $PATH. +- +- AC_PATH_PROGS(POTENTIAL_$1, [$]$1) +- if test "x$POTENTIAL_$1" != x; then +- $1=$POTENTIAL_$1 +- else +- AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found]) +- fi +- else +- # Otherwise it might already be a complete path +- if test ! -x "[$]$1"; then +- AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) +- fi +- fi + else + # No user supplied value. Locate compiler ourselves. + +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-14/fixed_libsctp_link_errors_caused_by_GCC10.patch b/recipes-core/openjdk/patches-openjdk-14/fixed_libsctp_link_errors_caused_by_GCC10.patch new file mode 100644 index 0000000..8111fa7 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-14/fixed_libsctp_link_errors_caused_by_GCC10.patch @@ -0,0 +1,64 @@ + +# HG changeset patch +# User qpzhang +# Date 1580894055 -28800 +# Node ID 8e6fa89397ca26bf9f573888755d89d7104afcd4 +# Parent eaefceb7f52e0b17c070c9388e2b2578d48dcf3e +8238386: (sctp) jdk.sctp/unix/native/libsctp/SctpNet.c "multiple definition" link errors with GCC10 +Summary: Fixed libsctp link errors caused by GCC10 default -fno-common +Reviewed-by: chegar + +diff -r eaefceb7f52e -r 8e6fa89397ca src/jdk.sctp/unix/native/libsctp/Sctp.h +--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h Tue Feb 11 14:24:31 2020 +0530 ++++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h Wed Feb 05 17:14:15 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -322,12 +322,12 @@ + + #endif /* __linux__ */ + +-sctp_getladdrs_func* nio_sctp_getladdrs; +-sctp_freeladdrs_func* nio_sctp_freeladdrs; +-sctp_getpaddrs_func* nio_sctp_getpaddrs; +-sctp_freepaddrs_func* nio_sctp_freepaddrs; +-sctp_bindx_func* nio_sctp_bindx; +-sctp_peeloff_func* nio_sctp_peeloff; ++extern sctp_getladdrs_func* nio_sctp_getladdrs; ++extern sctp_freeladdrs_func* nio_sctp_freeladdrs; ++extern sctp_getpaddrs_func* nio_sctp_getpaddrs; ++extern sctp_freepaddrs_func* nio_sctp_freepaddrs; ++extern sctp_bindx_func* nio_sctp_bindx; ++extern sctp_peeloff_func* nio_sctp_peeloff; + + jboolean loadSocketExtensionFuncs(JNIEnv* env); + +diff -r eaefceb7f52e -r 8e6fa89397ca src/jdk.sctp/unix/native/libsctp/SctpNet.c +--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c Tue Feb 11 14:24:31 2020 +0530 ++++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c Wed Feb 05 17:14:15 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -43,6 +43,13 @@ + static const char* nativeSctpLib = "libsctp.so.1"; + static jboolean funcsLoaded = JNI_FALSE; + ++sctp_getladdrs_func* nio_sctp_getladdrs; ++sctp_freeladdrs_func* nio_sctp_freeladdrs; ++sctp_getpaddrs_func* nio_sctp_getpaddrs; ++sctp_freepaddrs_func* nio_sctp_freepaddrs; ++sctp_bindx_func* nio_sctp_bindx; ++sctp_peeloff_func* nio_sctp_peeloff; ++ + JNIEXPORT jint JNICALL DEF_JNI_OnLoad + (JavaVM *vm, void *reserved) { + return JNI_VERSION_1_2; + diff --git a/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch b/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch new file mode 100644 index 0000000..66d480e --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch @@ -0,0 +1,49 @@ + +# HG changeset patch +# User qpzhang +# Date 1580905869 -28800 +# Node ID 9e54ea7d9cd9566d28cfcd9269118a1995fc361c +# Parent 932418820c80a87b77d96ad5f5525d282f00e82e +8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10 +Summary: Fixed libj2gss link errors caused by GCC10 default -fno-common +Reviewed-by: weijun + +diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100 ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -27,6 +27,9 @@ + #include <stdlib.h> + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100 ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -277,6 +277,6 @@ + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif + diff --git a/recipes-core/openjdk/patches-openjdk-14/libjava_childproc_multiple_definition_link_errors_with_GCC10.patch b/recipes-core/openjdk/patches-openjdk-14/libjava_childproc_multiple_definition_link_errors_with_GCC10.patch new file mode 100644 index 0000000..a972bc6 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-14/libjava_childproc_multiple_definition_link_errors_with_GCC10.patch @@ -0,0 +1,48 @@ + +# HG changeset patch +# User qpzhang +# Date 1580822830 -28800 +# Node ID 6925fca959590dd0f747a9cffa5f0664ec02c7b1 +# Parent 8f6ffa575f63db3f07f96e52c97883fbaff459b4 +8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10 +Reviewed-by: stuefe, clanger, rriggs +Contributed-by: patrick@os.amperecomputing.com + +diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c +--- a/src/java.base/unix/native/libjava/childproc.c Tue Feb 11 11:17:37 2020 +0800 ++++ b/src/java.base/unix/native/libjava/childproc.c Tue Feb 04 21:27:10 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -34,6 +34,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) +diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h +--- a/src/java.base/unix/native/libjava/childproc.h Tue Feb 11 11:17:37 2020 +0800 ++++ b/src/java.base/unix/native/libjava/childproc.h Tue Feb 04 21:27:10 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -126,7 +126,7 @@ + * The cached and split version of the JDK's effective PATH. + * (We don't support putenv("PATH=...") in native code) + */ +-const char * const *parentPathv; ++extern const char * const *parentPathv; + + ssize_t restartableWrite(int fd, const void *buf, size_t count); + int restartableDup2(int fd_from, int fd_to); + diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch index e9662eb..3bc5630 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch @@ -1,7 +1,7 @@ -From 836aad60652299a26341b46a4a9a2e6c418b6947 Mon Sep 17 00:00:00 2001 +From 21c555306afcc4cab2819adc550f1546f3390d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 13:36:53 +0000 -Subject: [PATCH 01/10] Allow using a system-installed libjpeg +Subject: [PATCH 01/13] Allow using a system-installed libjpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -73,5 +73,5 @@ index 6d803f9..d2732eb 100644 ############################################################################### -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch index ed8ecfa..98c09d6 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch @@ -1,7 +1,7 @@ -From ed79dc49323cc08e81b3699817825f66b1af0ce2 Mon Sep 17 00:00:00 2001 +From 17413a1bca9a6c27e049122d65b0d4fa291a53ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Thu, 2 Jan 2020 13:40:50 +0100 -Subject: [PATCH 02/10] Allow using a system-installed libpng +Subject: [PATCH 02/13] Allow using a system-installed libpng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -76,5 +76,5 @@ index d2732eb..727f018 100644 # # Check for the zlib library -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch index 0e3359c..d2b6031 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch @@ -1,7 +1,7 @@ -From 4cde9ea2adf8c57168a299f11625083d1822b0de Mon Sep 17 00:00:00 2001 +From 770123c9fcc4ab8c8ce8f37cde5afe9c44c7176c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 12 Mar 2018 15:40:58 +0000 -Subject: [PATCH 03/10] build: fix build on --as-needed toolchains (generic) +Subject: [PATCH 03/13] build: fix build on --as-needed toolchains (generic) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -87,5 +87,5 @@ index d961cf3..92f8033 100644 $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 endif -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch index db00b24..77efe81 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch @@ -1,7 +1,7 @@ -From f4c93547119c7550626e1b2ae2b750ea4f83b3fe Mon Sep 17 00:00:00 2001 +From 12dbeed90199730ad56ad842ae53e9d8aa477c0c Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:42:43 +0100 -Subject: [PATCH 04/10] don't expect fqpn for make +Subject: [PATCH 04/13] don't expect fqpn for make Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -29,5 +29,5 @@ index 4ee9cdd..c20ea76 100644 AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) fi -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch index 262f0b7..27a2ff2 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch @@ -1,7 +1,7 @@ -From b8bab47b58be4a0102011825c2ee3dd2c6427d08 Mon Sep 17 00:00:00 2001 +From def92aa795271fa3e6fd36009d89e06009d21c6a Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:44:25 +0100 -Subject: [PATCH 05/10] autoconf: filter aclocal copy too +Subject: [PATCH 05/13] autoconf: filter aclocal copy too Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -21,5 +21,5 @@ index c20ea76..8e06cd2 100644 | $TR -d '\n'` if test "x$filtered_files" != x; then -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch index c5fa4bf..58dd7bc 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch @@ -1,7 +1,7 @@ -From cf40c00dfd6d2299055c0e8415525d2da5e7cd4a Mon Sep 17 00:00:00 2001 +From ee5e07895570a9ea2ae2490f3b159bde29967238 Mon Sep 17 00:00:00 2001 From: Haiqing Bai <Haiqing.Bai@windriver.com> Date: Thu, 2 Jan 2020 13:45:42 +0100 -Subject: [PATCH 06/10] autoconf: handle extra output +Subject: [PATCH 06/13] autoconf: handle extra output When adding the environment variable JAVA_TOOL_OPTIONS an extra line in the output from 'java -version' is produced. As this output is @@ -26,5 +26,5 @@ index 5be15b8..0d1a6e1 100644 # Extra M4 quote needed to protect [] in grep expression. [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch index c99d599..01cabbd 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch @@ -1,7 +1,7 @@ -From ec3aa8ae1159ff5ef37fae1ba470cf1886aa8d79 Mon Sep 17 00:00:00 2001 +From b8d48149b05fcd1a12dce25ffc345b43aaa76f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> Date: Thu, 2 Jan 2020 13:49:02 +0100 -Subject: [PATCH 07/10] fix assembler flag handling in makefile +Subject: [PATCH 07/13] fix assembler flag handling in makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -32,5 +32,5 @@ index 92f8033..46a1be9 100644 # On windows we need to create a resource file ifeq ($(OPENJDK_TARGET_OS), windows) -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch index b783613..84a37a3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch @@ -1,7 +1,7 @@ -From c530da1c0269d1e9a875670943446876227fdb71 Mon Sep 17 00:00:00 2001 +From c03f916a8a49a3c83f72f28fefa6eab6377b909c Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:51:40 +0100 -Subject: [PATCH 08/10] autoconf: fix shark build (common) +Subject: [PATCH 08/13] autoconf: fix shark build (common) Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -33,5 +33,5 @@ index 727f018..91d2b5c 100644 if test "${LLVM_LIBS}" != ""; then LLVM_LIBS="${LLVM_LIBS} " -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch index 14fccd1..294e448 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch @@ -1,7 +1,7 @@ -From a5f2646a9dd0f7191e9e0aa5eba5fdd9d70d1671 Mon Sep 17 00:00:00 2001 +From a2a8f8df244efca22da633b676a45d62b2fbb580 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:53:50 +0100 -Subject: [PATCH 09/10] prevent debuginfo in favour of openembedded package +Subject: [PATCH 09/13] prevent debuginfo in favour of openembedded package split Signed-off-by: Richard Leitner <richard.leitner@skidata.com> @@ -150,5 +150,5 @@ index 46a1be9..b4ea2c6 100644 endif -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch index 57099ec..2aa4a8d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch @@ -1,7 +1,7 @@ -From 0d22dccb4de73d274b90e2647702b92958374bc1 Mon Sep 17 00:00:00 2001 +From 8864d47290e9d5563fb8f3ea92639c4accc46fe8 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:55:29 +0100 -Subject: [PATCH 10/10] autoconf: remove shell variables from autoheader +Subject: [PATCH 10/13] autoconf: remove shell variables from autoheader Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -42,5 +42,5 @@ index 8e06cd2..c220bba 100644 AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch index f1de194..88d2192 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch @@ -1,5 +1,20 @@ +From e878eea93b95d82d3ea13f4122f4f74cd2f8f3df Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 22 Oct 2020 09:23:06 +0200 +Subject: [PATCH 11/13] autoconf: fix CC with arguments detection + +Fix the compiler binary detection for exported CC variables with +arguments in them. + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + common/autoconf/toolchain.m4 | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 -index e3a82c8..705e3e7 100644 +index c0a4af5..28da6ea 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], @@ -41,3 +56,6 @@ index e3a82c8..705e3e7 100644 else # No user supplied value. Locate compiler ourselves. +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch index 39179d4..fc8fca5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch @@ -1,5 +1,17 @@ +From 03052435dc7f1146ddd7ebe6f510a89448d33aca Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 22 Oct 2020 09:24:50 +0200 +Subject: [PATCH 12/13] autoconf: NativeCompilation: remove sysroot + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/common/NativeCompilation.gmk | 6 ------ + 1 file changed, 6 deletions(-) + diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk -index d961cf3..9679f97 100644 +index b4ea2c6..01082f5 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -383,10 +383,6 @@ define SetupNativeCompilation @@ -22,3 +34,6 @@ index d961cf3..9679f97 100644 $1 := $$($1_TARGET) ifneq (,$$($1_LIBRARY)) # Generating a dynamic library. +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch index 4610c73..d3bd8e7 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch @@ -1,18 +1,24 @@ -# HG changeset patch -# User Richard Leitner <richard.leitner@skidata.com> -# Date 1588148111 -7200 -# Wed Apr 29 10:15:11 2020 +0200 -# Node ID e063bb17c5fb8edfbad1bfb5237b69350645ed0b -# Parent 041cb274be1207a991e05b041f57a800e8132cff -autoconf: remove Werror +From 3d7493808f435b70101003534d98e249bf7e734c Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Wed, 29 Apr 2020 10:15:11 +0200 +Subject: [PATCH 13/13] autoconf: remove Werror We don't want to mess around with disabling warnings on new compiler versions therefore we remove Werror. -diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 ---- a/common/autoconf/flags.m4 Fri Apr 24 04:22:43 2020 +0100 -+++ b/common/autoconf/flags.m4 Wed Apr 29 10:15:11 2020 +0200 -@@ -399,7 +399,7 @@ +Upstream-Status: Invalid + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + common/autoconf/flags.m4 | 12 +++--- + common/autoconf/generated-configure.sh | 56 +++++++++++++------------- + 2 files changed, 34 insertions(+), 34 deletions(-) + +diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 +index 077efa2..b98575a 100644 +--- a/common/autoconf/flags.m4 ++++ b/common/autoconf/flags.m4 +@@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" fi $2CXXSTD_CXXFLAG="-std=gnu++98" @@ -21,7 +27,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 [], [$2CXXSTD_CXXFLAG=""]) $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" -@@ -489,17 +489,17 @@ +@@ -489,17 +489,17 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], # Notably, -ffp-contract=off needs to be added for GCC >= 4.6, # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" @@ -42,7 +48,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 [], [NO_STRICT_ALIASING_FLAG=""]) if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test "x$NO_STRICT_ALIASING_FLAG" != "x"; then FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG" -@@ -866,11 +866,11 @@ +@@ -866,11 +866,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_GCC6_COMPILER_FLAGS], # Notably, value range propagation now assumes that the this pointer of C++ # member functions is non-null. NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" @@ -56,10 +62,11 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 [], [NO_LIFETIME_DSE_CFLAG=""]) CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" AC_SUBST([NO_LIFETIME_DSE_CFLAG]) -diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ---- a/common/autoconf/generated-configure.sh Fri Apr 24 04:22:43 2020 +0100 -+++ b/common/autoconf/generated-configure.sh Wed Apr 29 10:15:11 2020 +0200 -@@ -41490,12 +41490,12 @@ +diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +index d57035b..1953dc4 100644 +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } fi CXXSTD_CXXFLAG="-std=gnu++98" @@ -75,7 +82,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41646,12 +41646,12 @@ +@@ -41654,12 +41654,12 @@ fi NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" @@ -91,7 +98,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41686,12 +41686,12 @@ +@@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } fi @@ -107,7 +114,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41725,8 +41725,8 @@ +@@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } fi @@ -118,7 +125,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh supports=no if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi -@@ -41742,12 +41742,12 @@ +@@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" @@ -134,7 +141,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41781,12 +41781,12 @@ +@@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } fi @@ -150,7 +157,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41820,8 +41820,8 @@ +@@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } fi @@ -161,7 +168,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh supports=no if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi -@@ -41854,12 +41854,12 @@ +@@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" @@ -177,7 +184,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41898,12 +41898,12 @@ +@@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then M_NO_FUSED_ADD_FLAG="-mno-fused-madd" @@ -193,7 +200,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41938,12 +41938,12 @@ +@@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" @@ -209,3 +216,6 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch index 280ee60..b2e50e0 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch @@ -1,7 +1,7 @@ -From 5e8080a8dd56205f550f7c490f864c95dc8e509b Mon Sep 17 00:00:00 2001 +From 4d1bd6a65c52564f32761217ded7b9bdde43556b Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Sun, 17 Feb 2019 22:38:33 -0800 -Subject: [PATCH 1001/1012] hotspot: fix crash on JNI_CreateJavaVM +Subject: [PATCH 1001/1013] hotspot: fix crash on JNI_CreateJavaVM In function os::pd_create_stack_guard_pages(char* addr, size_t size), when addr < os::Linux::initial_thread_stack_bottom(), usually munmap() @@ -19,10 +19,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp -index 03cabfefb..4f28cc1fb 100644 +index c477851c1..47eef1e7c 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp -@@ -3192,7 +3192,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { +@@ -3227,7 +3227,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom(); unsigned char vec[1]; @@ -33,5 +33,5 @@ index 03cabfefb..4f28cc1fb 100644 stack_extent = (uintptr_t) get_stack_commited_bottom( os::Linux::initial_thread_stack_bottom(), -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch index 3f678dd..aa93c25 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch @@ -1,7 +1,7 @@ -From df566df123c8af8252c0e113c41c32482834923e Mon Sep 17 00:00:00 2001 +From e40d948b71ff33d74c6e1595a798f359fb673d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 09:28:06 +0000 -Subject: [PATCH 1002/1012] hotspot: use correct include for poll +Subject: [PATCH 1002/1013] hotspot: use correct include for poll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83,5 +83,5 @@ index 8e095ab69..ce37e9a12 100644 #include <unistd.h> #include <netdb.h> -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch index 8e31461..974c3a9 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch @@ -1,7 +1,7 @@ -From e5bf672f4e10997789f2a447fd95a88703dbd332 Mon Sep 17 00:00:00 2001 +From 1a4d6458d94bc275a740cab895f8ada303916cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 15:00:55 +0000 -Subject: [PATCH 1003/1012] hotspot: don't rely on old SysV SIGCLD +Subject: [PATCH 1003/1013] hotspot: don't rely on old SysV SIGCLD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -39,5 +39,5 @@ index ba84788a1..c22281f7c 100644 "CONT", SIGCONT, /* Continue (POSIX). */ "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch deleted file mode 100644 index ad480e3..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 3a6eef99b27b7dd750e7a02eb3ada71db99d9345 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Fri, 10 Aug 2018 14:54:45 +0100 -Subject: [PATCH 1004/1012] hotspot: backport patch to fix misuses of - strncpy/strncat -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Various small fixes around strncpy and strncat - -Compilation using gcc >= 8 fails because of errors regarding -misuse of string functions. -Fix them using a backport from openjdk-10 - -Modelled after http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Signed-off-by: Richard Leitner <richard.leitner@skidata.com> ---- - agent/src/os/linux/libproc_impl.c | 7 ++++++- - src/share/tools/hsdis/hsdis.c | 1 + - src/share/vm/compiler/compileBroker.hpp | 3 ++- - src/share/vm/compiler/disassembler.cpp | 1 + - src/share/vm/runtime/arguments.cpp | 13 ++++++------- - src/share/vm/utilities/ostream.cpp | 12 ++++++++---- - src/share/vm/utilities/vmError.cpp | 9 +-------- - 7 files changed, 25 insertions(+), 21 deletions(-) - -diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c -index ca791c95d..73a15ce35 100644 ---- a/hotspot/agent/src/os/linux/libproc_impl.c -+++ b/hotspot/agent/src/os/linux/libproc_impl.c -@@ -159,7 +159,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, - return NULL; - } - -- strncpy(newlib->name, libname, sizeof(newlib->name)); -+ if (strlen(libname) >= sizeof(newlib->name)) { -+ print_debug("libname %s too long\n", libname); -+ return NULL; -+ } -+ strcpy(newlib->name, libname); -+ - newlib->base = base; - - if (fd == -1) { -diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c -index 7bef1040f..1907d479e 100644 ---- a/hotspot/src/share/tools/hsdis/hsdis.c -+++ b/hotspot/src/share/tools/hsdis/hsdis.c -@@ -438,6 +438,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca - } - p = q; - } -+ *iop = '\0'; - } - - static void print_help(struct hsdis_app_data* app_data, -diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp -index ad37ff173..16e0ba3aa 100644 ---- a/hotspot/src/share/vm/compiler/compileBroker.hpp -+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp -@@ -173,7 +173,8 @@ class CompilerCounters : public CHeapObj<mtCompiler> { - // these methods should be called in a thread safe context - - void set_current_method(const char* method) { -- strncpy(_current_method, method, (size_t)cmname_buffer_length); -+ strncpy(_current_method, method, (size_t)cmname_buffer_length-1); -+ _current_method[cmname_buffer_length-1] = '\0'; - if (UsePerfData) _perf_current_method->set_value(method); - } - -diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp -index 93cd9e854..e7b32cd6b 100644 ---- a/hotspot/src/share/vm/compiler/disassembler.cpp -+++ b/hotspot/src/share/vm/compiler/disassembler.cpp -@@ -295,6 +295,7 @@ address decode_env::handle_event(const char* event, address arg) { - strlen((const char*)arg) > sizeof(buffer) - 1) { - // Only print this when the mach changes - strncpy(buffer, (const char*)arg, sizeof(buffer) - 1); -+ buffer[sizeof(buffer) - 1] = '\0'; - output()->print_cr("[Disassembling for mach='%s']", arg); - } - } else if (match(event, "format bytes-per-line")) { -diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp -index 2665b6b8c..5a9294677 100644 ---- a/hotspot/src/share/vm/runtime/arguments.cpp -+++ b/hotspot/src/share/vm/runtime/arguments.cpp -@@ -3455,7 +3455,7 @@ void Arguments::fix_appclasspath() { - } - - char* copy = AllocateHeap(strlen(src) + 1, mtInternal); -- strncpy(copy, src, strlen(src) + 1); -+ strcpy(copy, src); - - // trim all trailing empty paths - for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { -@@ -3834,17 +3834,16 @@ static char* get_shared_archive_path() { - if (end != NULL) *end = '\0'; - size_t jvm_path_len = strlen(jvm_path); - size_t file_sep_len = strlen(os::file_separator()); -- shared_archive_path = NEW_C_HEAP_ARRAY(char, jvm_path_len + -- file_sep_len + 20, mtInternal); -+ const size_t len = jvm_path_len + file_sep_len + 20; -+ shared_archive_path = NEW_C_HEAP_ARRAY(char, len, mtInternal); - if (shared_archive_path != NULL) { -- strncpy(shared_archive_path, jvm_path, jvm_path_len + 1); -- strncat(shared_archive_path, os::file_separator(), file_sep_len); -- strncat(shared_archive_path, "classes.jsa", 11); -+ jio_snprintf(shared_archive_path, len, "%s%sclasses.jsa", -+ jvm_path, os::file_separator()); - } - } else { - shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(SharedArchiveFile) + 1, mtInternal); - if (shared_archive_path != NULL) { -- strncpy(shared_archive_path, SharedArchiveFile, strlen(SharedArchiveFile) + 1); -+ strcpy(shared_archive_path, SharedArchiveFile); - } - } - return shared_archive_path; -diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp -index 1b00f829a..4daea2b7e 100644 ---- a/hotspot/src/share/vm/utilities/ostream.cpp -+++ b/hotspot/src/share/vm/utilities/ostream.cpp -@@ -342,15 +342,19 @@ void stringStream::write(const char* s, size_t len) { - assert(rm == NULL || Thread::current()->current_resource_mark() == rm, - "stringStream is re-allocated with a different ResourceMark"); - buffer = NEW_RESOURCE_ARRAY(char, end); -- strncpy(buffer, oldbuf, buffer_pos); -+ if (buffer_pos > 0) { -+ memcpy(buffer, oldbuf, buffer_pos); -+ } - buffer_length = end; - } - } - // invariant: buffer is always null-terminated - guarantee(buffer_pos + write_len + 1 <= buffer_length, "stringStream oob"); -- buffer[buffer_pos + write_len] = 0; -- strncpy(buffer + buffer_pos, s, write_len); -- buffer_pos += write_len; -+ if (write_len > 0) { -+ buffer[buffer_pos + write_len] = 0; -+ memcpy(buffer + buffer_pos, s, write_len); -+ buffer_pos += write_len; -+ } - - // Note that the following does not depend on write_len. - // This means that position and count get updated -diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp -index ef3bb5cee..c11fef472 100644 ---- a/hotspot/src/share/vm/utilities/vmError.cpp -+++ b/hotspot/src/share/vm/utilities/vmError.cpp -@@ -450,14 +450,7 @@ void VMError::report(outputStream* st) { - #else - const char *file = _filename; - #endif -- size_t len = strlen(file); -- size_t buflen = sizeof(buf); -- -- strncpy(buf, file, buflen); -- if (len + 10 < buflen) { -- sprintf(buf + len, ":%d", _lineno); -- } -- st->print(" (%s)", buf); -+ st->print(" (%s:%d)", file, _lineno); - } else { - st->print(" (0x%x)", _id); - } --- -2.24.1 - diff --git a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch index 81177d0..54534ed 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch @@ -1,7 +1,7 @@ -From bce7b39095a839b8e77fe068e87150e855224705 Mon Sep 17 00:00:00 2001 +From 794a7bf743e23ff74c4900801ddc56c253542b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 16:40:34 +0100 -Subject: [PATCH 1005/1012] hotspot: fix -Wreturn-type issues introduced by +Subject: [PATCH 1004/1013] hotspot: fix -Wreturn-type issues introduced by 8061651 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -24,10 +24,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp -index f43dc5ed7..8d7523c55 100644 +index c32c98ade..6f2221c41 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp -@@ -908,7 +908,7 @@ JVM_END +@@ -929,7 +929,7 @@ JVM_END JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)) JVMWrapper("JVM_KnownToNotExist"); #if INCLUDE_CDS @@ -36,7 +36,7 @@ index f43dc5ed7..8d7523c55 100644 #else return false; #endif -@@ -918,7 +918,7 @@ JVM_END +@@ -939,7 +939,7 @@ JVM_END JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) JVMWrapper("JVM_GetResourceLookupCacheURLs"); #if INCLUDE_CDS @@ -45,7 +45,7 @@ index f43dc5ed7..8d7523c55 100644 #else return NULL; #endif -@@ -928,7 +928,7 @@ JVM_END +@@ -949,7 +949,7 @@ JVM_END JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)) JVMWrapper("JVM_GetResourceLookupCache"); #if INCLUDE_CDS @@ -55,5 +55,5 @@ index f43dc5ed7..8d7523c55 100644 return NULL; #endif -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch index 38067cb..fe1837d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch @@ -1,7 +1,7 @@ -From 84fc6448f44cd45a5448d0e88df8ccabfa10dcc5 Mon Sep 17 00:00:00 2001 +From f8a3f19fa4fabaf57b0c2c77e966d9896399b3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 16:45:24 +0100 -Subject: [PATCH 1006/1012] hotspot: Zero build requires disabled warnings +Subject: [PATCH 1005/1013] hotspot: Zero build requires disabled warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -119,7 +119,7 @@ index d22ea1141..cbee43baa 100644 void os::Linux::set_fpu_control_word(int fpu) { diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp -index 39f77f858..b9c73dc48 100644 +index 94bc83a30..b3ba526f2 100644 --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp @@ -1,5 +1,5 @@ @@ -136,7 +136,7 @@ index 39f77f858..b9c73dc48 100644 + return false; // silence compile warning } - // These routines are only used on cpu architectures that + bool pd_get_top_frame_for_profiling(frame* fr_addr, -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch index 6692200..18aca4c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch @@ -1,7 +1,7 @@ -From 996a1e3d53773f41e9098117a69a060722972269 Mon Sep 17 00:00:00 2001 +From 5e21de887d87243b6be03781afb4015c4673851c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 16:46:33 +0100 -Subject: [PATCH 1007/1012] hotspot: Missing return statement in +Subject: [PATCH 1006/1013] hotspot: Missing return statement in __sync_val_compare_and_swap_8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -51,5 +51,5 @@ index cbee43baa..136d4d3de 100644 }; #endif // !_LP64 -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch index 10dd0f7..b5173a9 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch @@ -1,7 +1,7 @@ -From 2cce90259f9de7b5fba7f3380cdc90b3a586aa75 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Mon, 13 Aug 2018 16:48:32 +0100 -Subject: [PATCH 1008/1012] hotspot: Turn on the -Wreturn-type warning +From 024e0d522f205ca8659fce60ca4be68b9e3e08db Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 22 Oct 2020 09:41:07 +0200 +Subject: [PATCH 1007/1013] hotspot: Turn on the -Wreturn-type warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -61,7 +61,7 @@ index f42d1a288..c8f4ee161 100644 #ifndef PRODUCT diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp -index 1a7375afc..fbf51b040 100644 +index c35d8677f..65c3165ca 100644 --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, @@ -95,7 +95,7 @@ index 4b4b4e250..196622aed 100644 diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp -index ec97077b7..2621a7d62 100644 +index 83369cbcf..8dd4e6b21 100644 --- a/hotspot/src/share/vm/classfile/symbolTable.cpp +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { @@ -117,10 +117,10 @@ index ec97077b7..2621a7d62 100644 Symbol* SymbolTable::lookup_only(const char* name, int len, diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp -index da2717d36..5253afc22 100644 +index 4541e815a..98412e1e1 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -229,15 +229,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader +@@ -236,15 +236,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader class_name->as_C_string(), class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string())); if (FieldType::is_array(class_name)) { @@ -166,7 +166,7 @@ index 2f3abae6a..d58ebecb2 100644 static ReservedSpace* shared_rs() { CDS_ONLY(return _shared_rs); diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp -index 0698eb40e..354293924 100644 +index 68435471d..fad4a92cb 100644 --- a/hotspot/src/share/vm/oops/constantPool.hpp +++ b/hotspot/src/share/vm/oops/constantPool.hpp @@ -350,7 +350,7 @@ class ConstantPool : public Metadata { @@ -177,12 +177,12 @@ index 0698eb40e..354293924 100644 + return klass_at_impl(h_this, which, THREAD); } - Symbol* klass_name_at(int which); // Returns the name, w/o resolving. + Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving. diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp -index 8d7523c55..4034a8589 100644 +index 6f2221c41..daa69f89a 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp -@@ -4343,7 +4343,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( +@@ -4368,7 +4368,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( JVM_DTraceProvider* providers)) JVMWrapper("JVM_DTraceActivate"); return DTraceJSDT::activate( @@ -218,7 +218,7 @@ index d5bea29c3..50578ad63 100644 diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp -index 7ad2b71f4..182084373 100644 +index 8ea859ddb..535147f8c 100644 --- a/hotspot/src/share/vm/services/memTracker.hpp +++ b/hotspot/src/share/vm/services/memTracker.hpp @@ -64,7 +64,7 @@ class MemTracker : AllStatic { @@ -231,5 +231,5 @@ index 7ad2b71f4..182084373 100644 static inline void record_thread_stack(void* addr, size_t size) { } static inline void release_thread_stack(void* addr, size_t size) { } -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch index ee950cd..b3abd04 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch @@ -1,7 +1,7 @@ -From d085dcce6f8700fd8ddda475357496ea6da323dc Mon Sep 17 00:00:00 2001 +From dc6db949f4140b2dd7d3dfe040984bdfd88f2ba0 Mon Sep 17 00:00:00 2001 From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> Date: Fri, 21 Sep 2018 10:44:06 +0200 -Subject: [PATCH 1009/1012] hotspot: handle format error for GCC >= 7 +Subject: [PATCH 1008/1013] hotspot: handle format error for GCC >= 7 Upstream-Status: Pending @@ -12,10 +12,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp -index b3766636d..eba08d2f0 100644 +index 199169046..889b785c1 100644 --- a/hotspot/src/share/vm/adlc/output_c.cpp +++ b/hotspot/src/share/vm/adlc/output_c.cpp -@@ -436,9 +436,11 @@ static int pipeline_res_mask_initializer( +@@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer( for (i = maxcycleused; i > 0; i /= 10) cycledigit++; @@ -30,5 +30,5 @@ index b3766636d..eba08d2f0 100644 static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; static const char* pipeline_use_element = "Pipeline_Use_Element"; -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch index 03f8660..a68e3a0 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-fix-adlc-flags.patch @@ -1,7 +1,7 @@ -From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001 +From 486b1c46d80de99e0820cc6305477ab40ba4e13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> Date: Thu, 2 Jan 2020 10:19:29 +0100 -Subject: [PATCH 1010/1012] hotspot: fix adlc flags +Subject: [PATCH 1009/1013] hotspot: fix adlc flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -39,5 +39,5 @@ index 92b8b9b39..ae0aa0082 100644 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch index 8fe5489..8e70cab 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch @@ -1,7 +1,7 @@ -From 1015cc718ba25cabf613b96fd58baa8dfb8492fe Mon Sep 17 00:00:00 2001 +From 3028795037c3440415f3e8904e8015fbd480ab15 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 10:22:19 +0100 -Subject: [PATCH 1011/1012] hotspot: fix shark build (common) +Subject: [PATCH 1010/1013] hotspot: fix shark build (common) Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -22,7 +22,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 14 files changed, 123 insertions(+), 12 deletions(-) diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile -index 5765f1e36..f8ff9ecd9 100644 +index ad195763b..53b5ea046 100644 --- a/hotspot/make/Makefile +++ b/hotspot/make/Makefile @@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/% @@ -79,10 +79,10 @@ index 4707cc96e..a2b297ca0 100644 flow_block(blk, temp_vector, temp_set); if (failing()) return; // Watch for bailouts. diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp -index 5253afc22..ecb30cdef 100644 +index 98412e1e1..f62731c43 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -2300,6 +2300,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2392,6 +2392,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid spe = NULL; // Must create lots of stuff here, but outside of the SystemDictionary lock. m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); @@ -90,7 +90,7 @@ index 5253afc22..ecb30cdef 100644 if (!Arguments::is_interpreter_only()) { // Generate a compiled form of the MH intrinsic. AdapterHandlerLibrary::create_native_wrapper(m); -@@ -2309,6 +2310,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2401,6 +2402,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid "out of space in CodeCache for method handle intrinsic", empty); } } @@ -98,7 +98,7 @@ index 5253afc22..ecb30cdef 100644 // Now grab the lock. We might have to throw away the new method, // if a racing thread has managed to install one at the same time. { -@@ -2322,9 +2324,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2414,9 +2416,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid } assert(spe != NULL && spe->method() != NULL, ""); @@ -444,5 +444,5 @@ index 243183c07..601ca7925 100644 builder()->CreateICmpEQ(lock, check), released_fast, slow_path); -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch index b61f664..b5b9471 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-restrict-to-staging-dir.patch @@ -1,7 +1,7 @@ -From e4c080e29afa3f93383c1e046273cd20ec835ca3 Mon Sep 17 00:00:00 2001 +From 364b8a715b96f069bf455894b0ae290c52d3ab19 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 10:23:38 +0100 -Subject: [PATCH 1012/1012] hotspot: restrict to staging dir +Subject: [PATCH 1011/1013] hotspot: restrict to staging dir Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -22,5 +22,5 @@ index 386e94b1f..7642a67f8 100644 DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) REASON = "$(SDT_H_FILE) not found" -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch new file mode 100644 index 0000000..2239d48 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch @@ -0,0 +1,33 @@ +From 37b5885e35a7974bbd8895ae9a7e9ec7ebf9dc68 Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 20 Aug 2020 09:39:23 +0200 +Subject: [PATCH 1012/1013] hotspot: enable -Wno-error + +As we don't want to deal with compiler warnings in OpenEmbedded disable +them for now. + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/linux/makefiles/gcc.make | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make +index cd9511e50..94412c8fe 100644 +--- a/hotspot/make/linux/makefiles/gcc.make ++++ b/hotspot/make/linux/makefiles/gcc.make +@@ -200,8 +200,8 @@ else + CFLAGS += -pipe + endif + +-# Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++# Compiler warnings are not treated as errors ++WARNINGS_ARE_ERRORS = -Wno-error + + ifeq ($(USE_CLANG), true) + # However we need to clean the code up before we can unrestrictedly enable this option with Clang +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-add-missing-includes-for-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-add-missing-includes-for-shark-build-pt2.patch new file mode 100644 index 0000000..a2e4726 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-add-missing-includes-for-shark-build-pt2.patch @@ -0,0 +1,32 @@ +From d497bc0b36be083400d2802019ffdf49f5d5ca94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 20 Aug 2020 10:10:55 +0200 +Subject: [PATCH 1013/1013] hotspot: add missing includes for shark build (pt2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + src/cpu/zero/vm/entry_zero.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hotspot/src/cpu/zero/vm/entry_zero.hpp b/hotspot/src/cpu/zero/vm/entry_zero.hpp +index 73987f061..c5f50672b 100644 +--- a/hotspot/src/cpu/zero/vm/entry_zero.hpp ++++ b/hotspot/src/cpu/zero/vm/entry_zero.hpp +@@ -26,6 +26,8 @@ + #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP + #define CPU_ZERO_VM_ENTRY_ZERO_HPP + ++#include "utilities/globalDefinitions.hpp" ++#include "utilities/exceptions.hpp" + #include "interpreter/cppInterpreter.hpp" + + class ZeroEntry { +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch deleted file mode 100644 index bc844be..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/1013-hotspot-make-disable-Werror.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r 12177d88b89c hotspot/make/linux/makefiles/gcc.make ---- a/hotspot/make/linux/makefiles/gcc.make Thu Sep 26 07:17:41 2019 +0100 -+++ b/hotspot/make/linux/makefiles/gcc.make Wed Apr 29 10:56:10 2020 +0200 -@@ -200,8 +200,8 @@ - CFLAGS += -pipe - endif - --# Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -+# Compiler warnings are not treated as errors -+WARNINGS_ARE_ERRORS = -Wno-error - - ifeq ($(USE_CLANG), true) - # However we need to clean the code up before we can unrestrictedly enable this option with Clang diff --git a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch b/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch index bedc448..d4294d2 100644 --- a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch @@ -1,19 +1,21 @@ -From 658adc5b6567e9a6df56beabb8d226a9b4d8e762 Mon Sep 17 00:00:00 2001 +From f4d687a4d6ddb08cae3bcce46257ea57544294c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Thu, 16 Aug 2018 02:27:44 +0100 -Subject: [PATCH] hotspot/aarch32: fix missing return values +Subject: [PATCH 1201/1202] hotspot/aarch32: fix missing return values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Upstream-Status: Pending Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++ - hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 + + src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++ + src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp -index cd291bf2..4ba98c68 100644 +index 8aae15af2..76b6f1fe9 100644 --- a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp +++ b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp @@ -158,16 +158,19 @@ static Register as_reg(LIR_Opr op) { @@ -37,7 +39,7 @@ index cd291bf2..4ba98c68 100644 Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp, Address::InsnDataType type) { diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp -index 979d53c9..c0b1a4c7 100644 +index 979d53c98..c0b1a4c7a 100644 --- a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp +++ b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp @@ -87,6 +87,7 @@ address Relocation::pd_call_destination(address orig_addr) { @@ -49,5 +51,5 @@ index 979d53c9..c0b1a4c7 100644 void Relocation::pd_set_call_destination(address x) { -- -2.18.0 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-remaining-musl-fixes.patch b/recipes-core/openjdk/patches-openjdk-8/1202-hotspot-aarch32-remaining-musl-fixes.patch index 1140887..12137c1 100644 --- a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-remaining-musl-fixes.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1202-hotspot-aarch32-remaining-musl-fixes.patch @@ -1,7 +1,7 @@ -From 4bab4a4468a59e303e8d05a409a07a24c2342452 Mon Sep 17 00:00:00 2001 +From 4726119a39e937ab1a70335a6bc89645742d44fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 20 Aug 2018 12:38:38 +0100 -Subject: [PATCH] hotspot: remaining musl fixes (aarch32) +Subject: [PATCH 1202/1202] hotspot/aarch32: remaining musl fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,12 +14,13 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [OE specific] Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | 1 - + src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp -index 052a423c..93a315e4 100644 +index 2883fc17f..162504301 100644 --- a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp +++ b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp @@ -75,7 +75,6 @@ @@ -31,5 +32,5 @@ index 052a423c..93a315e4 100644 #define REG_FP 29 #define SPELL_REG_SP "sp" -- -2.11.0 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-Fix-further-functions-with-a-missing.patch b/recipes-core/openjdk/patches-openjdk-8/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch index 0216c68..e4aa48f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-Fix-further-functions-with-a-missing.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch @@ -1,8 +1,8 @@ -From 3dffe06da016a959f1d8c3afc292ab92a9d4d137 Mon Sep 17 00:00:00 2001 +From 2e611155c42352c1a0c15078681c6712711f6c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Mon, 13 Aug 2018 17:03:56 +0100 -Subject: [PATCH] hotspot/aarch64: Fix further functions with a missing return - value. +Subject: [PATCH 1401/1402] hotspot/aarch64: Add missing return value to + LIR_Assembler::as_Address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,17 +15,19 @@ Content-Transfer-Encoding: 8bit |# Parent 3ade0115344b77e6d00462044e0cf68722685bfe PR3519: Fix further functions with a missing return value. -Signed-off-by: André Draszik <andre.draszik@jci.com> Upstream-Status: Backport + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 1 + + src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -index 4e98cb39..bbc81b4a 100644 +index 7b85119c3..074e71a7d 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -@@ -205,6 +205,7 @@ Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp) { +@@ -207,6 +207,7 @@ Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp) { return Address(base, tmp, Address::lsl(addr->scale())); } } @@ -34,5 +36,5 @@ index 4e98cb39..bbc81b4a 100644 Address LIR_Assembler::as_Address_hi(LIR_Address* addr) { -- -2.18.0 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-remaining-musl-fixes.patch b/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch index 436f012..2aafd82 100644 --- a/recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-remaining-musl-fixes.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch @@ -1,7 +1,7 @@ -From 8e8e79c136fe56db119fd9a76fb881e96727c840 Mon Sep 17 00:00:00 2001 +From 033183cd3598ff8ba4a40ef529dfad89c6226ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 15:33:17 +0000 -Subject: [PATCH] hotspot: remaining musl fixes (aarch64) +Subject: [PATCH 1402/1402] hotspot/aarch64: remaining musl fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,24 +12,26 @@ Content-Transfer-Encoding: 8bit | ^~~~~~~~~~~~~~~ Upstream-Status: Inappropriate [OE specific] + Signed-off-by: André Draszik <andre.draszik@jci.com> +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- - hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 2 +- + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -index 8b985693..23f196cd 100644 +index 27dcbfa97..33779ae57 100644 --- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -@@ -75,7 +75,7 @@ +@@ -72,7 +72,7 @@ # include <pwd.h> # include <poll.h> # include <ucontext.h> -# include <fpu_control.h> +# include <linux/types.h> /* provides __u64 */ - #ifdef BUILTIN_SIM - #define REG_SP REG_RSP + #define REG_FP 29 + -- -2.16.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch index 38d3019..bd6c38d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch @@ -1,7 +1,7 @@ -From 46ea1c28b53bf5fd2be03fa1d78936f6a1e70fc4 Mon Sep 17 00:00:00 2001 +From b4e7774c35cf29aaca2bd04d115afc3ea3c77d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Fri, 2 Mar 2018 11:13:08 +0000 -Subject: [PATCH 2001/2008] jdk: comparison between pointer and integer +Subject: [PATCH 2001/2009] jdk: comparison between pointer and integer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,7 +28,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c -index b1b8223a6..2eee6261a 100644 +index b1b8223a63..2eee6261ac 100644 --- a/jdk/src/share/native/java/net/net_util.c +++ b/jdk/src/share/native/java/net/net_util.c @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { @@ -99,7 +99,7 @@ index b1b8223a6..2eee6261a 100644 int scope; diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h -index c8a5e68c4..176ca586e 100644 +index c8a5e68c49..176ca586ee 100644 --- a/jdk/src/share/native/java/net/net_util.h +++ b/jdk/src/share/native/java/net/net_util.h @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); @@ -120,7 +120,7 @@ index c8a5e68c4..176ca586e 100644 extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c -index 0a51a365f..dcc348cf1 100644 +index 0a51a365fd..dcc348cf1f 100644 --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, @@ -142,5 +142,5 @@ index 0a51a365f..dcc348cf1 100644 goto cleanupAndReturn; } -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch index 4d1df8a..64d6113 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch @@ -1,7 +1,7 @@ -From aef9a3f955f6e189b2a24b9f79ccb396275d4fa3 Mon Sep 17 00:00:00 2001 +From 1d7ea474a12a12e0e28e1a24f686a7478fe42b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 13:36:53 +0000 -Subject: [PATCH 2002/2008] jdk: Allow using a system-installed libjpeg +Subject: [PATCH 2002/2009] jdk: Allow using a system-installed libjpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -30,10 +30,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index a06bfd6db..12b9da11d 100644 +index 9368a9d508..7fffcafc70 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -695,21 +695,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) +@@ -702,21 +702,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## @@ -64,7 +64,7 @@ index a06bfd6db..12b9da11d 100644 # Suppress gcc warnings like "variable might be clobbered by 'longjmp' # or 'vfork'": this warning indicates that some variable is placed to # a register by optimized compiler and it's value might be lost on longjmp(). -@@ -721,37 +724,50 @@ endif +@@ -728,37 +731,50 @@ endif # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -129,7 +129,7 @@ index a06bfd6db..12b9da11d 100644 ########################################################################################## -@@ -1142,6 +1158,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1149,6 +1165,13 @@ ifndef BUILD_HEADLESS_ONLY GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif @@ -143,7 +143,7 @@ index a06bfd6db..12b9da11d 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1198,11 +1221,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1205,11 +1228,13 @@ ifndef BUILD_HEADLESS_ONLY EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ @@ -160,7 +160,7 @@ index a06bfd6db..12b9da11d 100644 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java -index 8f58f5b3e..fcbab8260 100644 +index 8f58f5b3e6..fcbab82602 100644 --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java @@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader { @@ -173,7 +173,7 @@ index 8f58f5b3e..fcbab8260 100644 } }); diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java -index 6a33bd5a1..dca189ed8 100644 +index 6a33bd5a15..dca189ed85 100644 --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java @@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter { @@ -186,7 +186,7 @@ index 6a33bd5a1..dca189ed8 100644 } }); diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java -index 872ffc019..5965a186b 100644 +index 872ffc0197..5965a186b9 100644 --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java @@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder { @@ -199,7 +199,7 @@ index 872ffc019..5965a186b 100644 } }); diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c -index 7e1d8c99d..8cac61da3 100644 +index 7e1d8c99d7..8cac61da32 100644 --- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c @@ -51,7 +51,7 @@ @@ -212,5 +212,5 @@ index 7e1d8c99d..8cac61da3 100644 #undef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch index 13d3045..9c4e70e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch @@ -1,7 +1,7 @@ -From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 Mon Sep 17 00:00:00 2001 +From c7fb1d599ba66116fb132537b4696092e9c48331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 13:43:04 +0000 -Subject: [PATCH 2003/2008] jdk: Allow using a system-installed libpng +Subject: [PATCH 2003/2009] jdk: Allow using a system-installed libpng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -24,10 +24,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index 12b9da11d..cd8b94cd8 100644 +index 7fffcafc70..7f42e09ce4 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -1148,7 +1148,6 @@ endif +@@ -1155,7 +1155,6 @@ endif ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_DIRS := \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ @@ -35,7 +35,7 @@ index 12b9da11d..cd8b94cd8 100644 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen ifeq ($(USE_EXTERNAL_LIBGIF), true) -@@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1172,6 +1171,13 @@ ifndef BUILD_HEADLESS_ONLY LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg endif @@ -49,7 +49,7 @@ index 12b9da11d..cd8b94cd8 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1229,12 +1235,12 @@ ifndef BUILD_HEADLESS_ONLY LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ @@ -65,7 +65,7 @@ index 12b9da11d..cd8b94cd8 100644 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c -index 3599433e4..5bf002ea1 100644 +index 3599433e42..5bf002ea17 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c @@ -25,8 +25,7 @@ @@ -79,5 +79,5 @@ index 3599433e4..5bf002ea1 100644 #define SIG_BYTES 8 -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch index 365b4d6..7f8d3b3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch @@ -1,7 +1,7 @@ -From 48d7384387394820f2f5e8bdc2982c242568b548 Mon Sep 17 00:00:00 2001 +From 5bced26833d8e7876852fa65479f7ada5266a3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 09:28:06 +0000 -Subject: [PATCH 2004/2008] jdk: use correct include for poll +Subject: [PATCH 2004/2009] jdk: use correct include for poll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -39,10 +39,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c -index 8c070e4b7..126f4d7d4 100644 +index 90d57b42f0..fbeb73efa4 100644 --- a/jdk/src/aix/native/java/net/aix_close.c +++ b/jdk/src/aix/native/java/net/aix_close.c -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ #include <unistd.h> #include <errno.h> @@ -52,7 +52,7 @@ index 8c070e4b7..126f4d7d4 100644 /* * Stack allocated by thread when doing blocking operation diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c -index 70064b890..c10c602b6 100644 +index 70064b890e..c10c602b6b 100644 --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c @@ -34,7 +34,7 @@ @@ -65,7 +65,7 @@ index 70064b890..c10c602b6 100644 #include <fcntl.h> #include <stddef.h> diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c -index 71cbdf8ce..170957e73 100644 +index 373c5e3625..9aafbc09e5 100644 --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c @@ -28,7 +28,7 @@ @@ -78,10 +78,10 @@ index 71cbdf8ce..170957e73 100644 #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ #include <netinet/in.h> diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c -index af57cef30..64d040887 100644 +index 89a20707c4..511ab845a8 100644 --- a/jdk/src/solaris/native/java/net/bsd_close.c +++ b/jdk/src/solaris/native/java/net/bsd_close.c -@@ -36,7 +36,7 @@ +@@ -38,7 +38,7 @@ #include <sys/uio.h> #include <unistd.h> #include <errno.h> @@ -91,10 +91,10 @@ index af57cef30..64d040887 100644 /* * Stack allocated by thread when doing blocking operation diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c -index 98e1ce098..85fba135f 100644 +index eacc2afd15..159ca132c4 100644 --- a/jdk/src/solaris/native/java/net/linux_close.c +++ b/jdk/src/solaris/native/java/net/linux_close.c -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ #include <sys/uio.h> #include <unistd.h> #include <errno.h> @@ -104,7 +104,7 @@ index 98e1ce098..85fba135f 100644 /* * Stack allocated by thread when doing blocking operation diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h -index a48446de9..8915b68aa 100644 +index a48446de9c..8915b68aae 100644 --- a/jdk/src/solaris/native/java/net/net_util_md.h +++ b/jdk/src/solaris/native/java/net/net_util_md.h @@ -33,7 +33,7 @@ @@ -117,7 +117,7 @@ index a48446de9..8915b68aa 100644 diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c -index 6860a167b..20849dabc 100644 +index 6860a167bb..20849dabcf 100644 --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c @@ -28,7 +28,7 @@ @@ -130,7 +130,7 @@ index 6860a167b..20849dabc 100644 #include <sys/time.h> diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c -index 73560ad6c..a3720055c 100644 +index 73560ad6c6..a3720055c4 100644 --- a/jdk/src/solaris/native/sun/nio/ch/Net.c +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c @@ -23,7 +23,7 @@ @@ -143,7 +143,7 @@ index 73560ad6c..a3720055c 100644 #include <sys/socket.h> #include <string.h> diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c -index 375aaa485..7606e9ba8 100644 +index 375aaa4850..7606e9ba82 100644 --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c @@ -32,7 +32,7 @@ @@ -156,7 +156,7 @@ index 375aaa485..7606e9ba8 100644 #include "sun_nio_fs_LinuxWatchService.h" diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c -index 33e062e08..819fcabdb 100644 +index 33e062e087..819fcabdb8 100644 --- a/jdk/src/solaris/transport/socket/socket_md.c +++ b/jdk/src/solaris/transport/socket/socket_md.c @@ -37,7 +37,7 @@ @@ -169,5 +169,5 @@ index 33e062e08..819fcabdb 100644 #include "socket_md.h" -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch index 32bde99..f1f5102 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch @@ -1,7 +1,7 @@ -From 606c807be8e01a4cc99a02b50717d9bce141e8a2 Mon Sep 17 00:00:00 2001 +From 385b2007a60c3e792062107d3c4f653fe63d4c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 09:28:06 +0000 -Subject: [PATCH 2005/2008] jdk: use correct include for signal +Subject: [PATCH 2005/2009] jdk: use correct include for signal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -34,7 +34,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c -index c0d585796..c4abb7ae5 100644 +index c0d5857962..c4abb7ae5d 100644 --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c @@ -32,7 +32,7 @@ @@ -47,7 +47,7 @@ index c0d585796..c4abb7ae5 100644 /* Also defined in src/aix/native/java/net/aix_close.c */ #define INTERRUPT_SIGNAL (SIGRTMAX - 1) diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h -index 012bb1bab..0b5757683 100644 +index 012bb1babe..0b57576833 100644 --- a/jdk/src/macosx/javavm/export/jvm_md.h +++ b/jdk/src/macosx/javavm/export/jvm_md.h @@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@ index 012bb1bab..0b5757683 100644 /* O Flags */ diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h -index 5c681914b..62415ee25 100644 +index 5c681914bb..62415ee255 100644 --- a/jdk/src/solaris/javavm/export/jvm_md.h +++ b/jdk/src/solaris/javavm/export/jvm_md.h @@ -65,7 +65,7 @@ @@ -73,7 +73,7 @@ index 5c681914b..62415ee25 100644 /* O Flags */ diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c -index 5e2a78b7a..204f0441a 100644 +index 5e2a78b7af..204f0441a9 100644 --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c @@ -34,7 +34,7 @@ @@ -86,5 +86,5 @@ index 5e2a78b7a..204f0441a 100644 #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) #elif __solaris__ -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch index dd5e051..6f9c174 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch @@ -1,7 +1,7 @@ -From 86de5eb9d031e7f8d241725d5eeaa7030cf2ce2b Mon Sep 17 00:00:00 2001 +From 80a07db16d9de0cd875b9c8e86678a51b6e75dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Fri, 2 Mar 2018 13:58:07 +0000 -Subject: [PATCH 2006/2008] jdk: disable backtrace() (musl build fix) +Subject: [PATCH 2006/2009] jdk: disable backtrace() (musl build fix) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -20,7 +20,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c -index 2425bf43a..1c8ebdb42 100644 +index 95d2baff5b..41dfa992a7 100644 --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c @@ -27,7 +27,7 @@ @@ -32,7 +32,7 @@ index 2425bf43a..1c8ebdb42 100644 #include <execinfo.h> #endif -@@ -803,7 +803,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv +@@ -796,7 +796,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv return ret; } @@ -42,5 +42,5 @@ index 2425bf43a..1c8ebdb42 100644 { void *array[10]; -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch index 8f3d134..62c5b98 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch @@ -1,7 +1,7 @@ -From 0708dd8e56c1f28c2215561ba3035c8c538acef6 Mon Sep 17 00:00:00 2001 +From 6f76fb04370713bdae2485261d987448c9350179 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:25:12 +0100 -Subject: [PATCH 2007/2008] jdk: no genx11 in headless +Subject: [PATCH 2007/2009] jdk: no genx11 in headless Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -9,7 +9,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk -index ba443f7da..2170150ac 100644 +index ba443f7da5..2170150aca 100644 --- a/jdk/make/GenerateSources.gmk +++ b/jdk/make/GenerateSources.gmk @@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) @@ -28,5 +28,5 @@ index ba443f7da..2170150ac 100644 endif -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch index e725bf9..4c462c4 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch @@ -1,7 +1,7 @@ -From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001 +From 335f9891be66e1292509d6a9dc18d41fac0a066c Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 2 Jan 2020 13:26:42 +0100 -Subject: [PATCH 2008/2008] jdk: no unused deps +Subject: [PATCH 2008/2009] jdk: no unused deps Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- @@ -12,7 +12,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk -index c23b958b0..2984302f0 100644 +index c23b958b06..2984302f0a 100644 --- a/jdk/make/CompileNativeLibraries.gmk +++ b/jdk/make/CompileNativeLibraries.gmk @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk @@ -26,7 +26,7 @@ index c23b958b0..2984302f0 100644 # Include the corresponding custom file, if present. -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index cd8b94cd8..8d9c37246 100644 +index 7f42e09ce4..10232b61ca 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) @@ -40,7 +40,7 @@ index cd8b94cd8..8d9c37246 100644 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ $(X_CFLAGS) \ $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) -@@ -801,17 +805,28 @@ ifeq ($(BUILD_HEADLESS), true) +@@ -808,17 +812,28 @@ ifeq ($(BUILD_HEADLESS), true) -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) @@ -74,7 +74,7 @@ index cd8b94cd8..8d9c37246 100644 OGLBlitLoops.c \ OGLBufImgOps.c \ OGLContext.c \ -@@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true) +@@ -831,10 +846,9 @@ ifeq ($(BUILD_HEADLESS), true) OGLSurfaceData.c \ OGLTextRenderer.c \ OGLVertexCache.c \ @@ -88,7 +88,7 @@ index cd8b94cd8..8d9c37246 100644 LIBAWT_HEADLESS_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c -index 64284bc6e..b3584c7ef 100644 +index 64284bc6e9..b3584c7efe 100644 --- a/jdk/src/solaris/native/sun/awt/jawt.c +++ b/jdk/src/solaris/native/sun/awt/jawt.c @@ -33,7 +33,7 @@ @@ -101,7 +101,7 @@ index 64284bc6e..b3584c7ef 100644 return JNI_FALSE; #else diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h -index ceea38f43..8d85782ba 100644 +index ceea38f434..8d85782ba0 100644 --- a/jdk/src/solaris/native/sun/awt/utility/rect.h +++ b/jdk/src/solaris/native/sun/awt/utility/rect.h @@ -28,7 +28,7 @@ @@ -114,5 +114,5 @@ index ceea38f43..8d85782ba 100644 typedef XRectangle RECT_T; #else -- -2.24.1 +2.26.2 diff --git a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch new file mode 100644 index 0000000..d75e264 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch @@ -0,0 +1,29 @@ +From 2d5e8ce975fb241a825dbf070923ccbdf8b65ee9 Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Thu, 20 Aug 2020 11:24:40 +0200 +Subject: [PATCH 2009/2009] jdk: make: use gcc instead of ld for + genSocketOptionRegistry + +Upstream-Status: Pending + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + make/gensrc/GensrcMisc.gmk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk +index 9db5c9d6f7..84a3c27e7d 100644 +--- a/jdk/make/gensrc/GensrcMisc.gmk ++++ b/jdk/make/gensrc/GensrcMisc.gmk +@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \ + INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \ + LANG := C, \ + CC := $(BUILD_CC), \ +- LDEXE := $(BUILD_LD), \ ++ LDEXE := $(BUILD_CC), \ + OBJECT_DIR := $(GENSRC_SOR_BIN), \ + OUTPUT_DIR := $(GENSRC_SOR_BIN), \ + PROGRAM := genSocketOptionRegistry)) +-- +2.26.2 + diff --git a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch deleted file mode 100644 index e35d0eb..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk -=================================================================== ---- jdk8u-jdk8u242-ga.orig/jdk/make/gensrc/GensrcMisc.gmk -+++ jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk -@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUI - INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \ - LANG := C, \ - CC := $(BUILD_CC), \ -- LDEXE := $(BUILD_LD), \ -+ LDEXE := $(BUILD_CC), \ - OBJECT_DIR := $(GENSRC_SOR_BIN), \ - OUTPUT_DIR := $(GENSRC_SOR_BIN), \ - PROGRAM := genSocketOptionRegistry)) diff --git a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch deleted file mode 100644 index b09745c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/cpu/zero/vm/entry_zero.hpp -+++ hotspot/src/cpu/zero/vm/entry_zero.hpp -@@ -26,6 +26,8 @@ - #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP - #define CPU_ZERO_VM_ENTRY_ZERO_HPP - -+#include "utilities/globalDefinitions.hpp" -+#include "utilities/exceptions.hpp" - #include "interpreter/cppInterpreter.hpp" - - class ZeroEntry { diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch deleted file mode 100644 index b09745c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/cpu/zero/vm/entry_zero.hpp -+++ hotspot/src/cpu/zero/vm/entry_zero.hpp -@@ -26,6 +26,8 @@ - #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP - #define CPU_ZERO_VM_ENTRY_ZERO_HPP - -+#include "utilities/globalDefinitions.hpp" -+#include "utilities/exceptions.hpp" - #include "interpreter/cppInterpreter.hpp" - - class ZeroEntry { diff --git a/recipes-images/images/openjdk-14-test-image.bb b/recipes-images/images/openjdk-14-test-image.bb new file mode 100644 index 0000000..62be748 --- /dev/null +++ b/recipes-images/images/openjdk-14-test-image.bb @@ -0,0 +1,3 @@ +IMAGE_INSTALL_append = " openjdk-14 " + +inherit openjdk-test-image diff --git a/recipes-images/images/openjre-14-test-image.bb b/recipes-images/images/openjre-14-test-image.bb new file mode 100644 index 0000000..e950fe3 --- /dev/null +++ b/recipes-images/images/openjre-14-test-image.bb @@ -0,0 +1,3 @@ +IMAGE_INSTALL_append = " openjre-14 " + +inherit openjre-test-image |