From: Jan Palus Date: Sun, 30 Aug 2020 16:15:09 +0000 (+0200) Subject: up to 10.0.2.13 X-Git-Tag: auto/th/openjdk11-11.0.8-1~3 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenjdk11.git;a=commitdiff_plain;h=7ac9833 up to 10.0.2.13 --- diff --git a/aarch64.patch b/aarch64.patch index 5e22a1e..8be9be4 100644 --- a/aarch64.patch +++ b/aarch64.patch @@ -1,6 +1,6 @@ -diff -r 6721e038257a -r 15cc1c8a6371 hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp ---- a/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp Thu Dec 13 01:15:21 2018 +0000 -+++ b/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp Tue Feb 04 04:42:57 2020 +0000 +diff -r 6721e038257a -r 15cc1c8a6371 src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp +--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp Thu Dec 13 01:15:21 2018 +0000 ++++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp Tue Feb 04 04:42:57 2020 +0000 @@ -38,8 +38,6 @@ protected: diff --git a/build.patch b/build.patch new file mode 100644 index 0000000..a044171 --- /dev/null +++ b/build.patch @@ -0,0 +1,25 @@ + +# HG changeset patch +# User sgehwolf +# Date 1542877918 -3600 +# Node ID 7088cfa71363656579b585f14d55ad45c654a7a0 +# Parent 4f45c682eab0ef38fc3b81681589590479994c87 +8214105: [TESTBUG] Bit test is always false in serviceability/jvmti/StartPhase/AllowedFunctions +Reviewed-by: dcubed, dholmes, jcbeyler, gadams, sspitsyn +Contributed-by: Simon Tooke + +diff -r 4f45c682eab0 -r 7088cfa71363 test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c +--- a/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c Thu Nov 22 10:01:38 2018 +0100 ++++ b/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c Thu Nov 22 10:11:58 2018 +0100 +@@ -110,8 +110,8 @@ + // This function is only used in a ClassPrepare event context + if ((status & JVMTI_CLASS_STATUS_VERIFIED) == 0 || + (status & JVMTI_CLASS_STATUS_PREPARED) == 0 || +- (status & JVMTI_CLASS_STATUS_INITIALIZED) == 1 || +- (status & JVMTI_CLASS_STATUS_ERROR) == 1) { ++ (status & JVMTI_CLASS_STATUS_INITIALIZED) != 0 || ++ (status & JVMTI_CLASS_STATUS_ERROR) != 0) { + printf(" ## Error: unexpected class status: 0x%08x\n", status); + } + printf(" Class status: 0x%08x\n", status); + diff --git a/libpath.patch b/libpath.patch index c795998..0873ca2 100644 --- a/libpath.patch +++ b/libpath.patch @@ -1,5 +1,5 @@ ---- jdk9u-jdk-9.0.4+12/hotspot/src/os/linux/vm/os_linux.cpp.orig 2020-08-16 13:46:08.240275890 +0200 -+++ jdk9u-jdk-9.0.4+12/hotspot/src/os/linux/vm/os_linux.cpp 2020-08-16 13:47:54.932632691 +0200 +--- jdk9u-jdk-9.0.4+12/src/hotspot/os/linux/os_linux.cpp.orig 2020-08-16 13:46:08.240275890 +0200 ++++ jdk9u-jdk-9.0.4+12/src/hotspot/os/linux/os_linux.cpp 2020-08-16 13:47:54.932632691 +0200 @@ -289,9 +289,9 @@ // ... // 7: The default directories, normally /lib and /usr/lib. diff --git a/openjdk9.spec b/openjdk10.spec similarity index 87% rename from openjdk9.spec rename to openjdk10.spec index 407bb68..2ab59bb 100644 --- a/openjdk9.spec +++ b/openjdk10.spec @@ -2,9 +2,9 @@ %bcond_without cacerts # don't include the default CA certificates %if %{with bootstrap} -%define use_jdk icedtea8 -%else %define use_jdk openjdk9 +%else +%define use_jdk openjdk10 %endif %ifarch %{x8664} @@ -12,42 +12,26 @@ %endif # class data version seen with file(1) that this jvm is able to load -%define _classdataversion 53.0 - -%define ver_u 9.0.4 -%define ver_b 12 +%define _classdataversion 54.0 -# JDK/JRE version, as returned with `java -version`, '_' replaced with '.' -%define _jdkversion %{ver_u} +%define ver_u 10.0.2 +%define ver_b 13 Summary: Open-source implementation of the Java Platform, Standard Edition -Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 9 SE -Name: openjdk9 +Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 10 SE +Name: openjdk10 Version: %{ver_u}.%{ver_b} Release: 1 License: GPL v2 Group: Development/Languages/Java -Source0: https://hg.openjdk.java.net/jdk-updates/jdk9u/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-%{version}.tar.bz2 -# Source0-md5: f71280d31603efeffdadea56fab8436e -Source1: https://hg.openjdk.java.net/jdk-updates/jdk9u/corba/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-corba-%{version}.tar.bz2 -# Source1-md5: 2bc0a490f71eaa17fcae9387b354ccfd -Source2: https://hg.openjdk.java.net/jdk-updates/jdk9u/hotspot/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-hotspot-%{version}.tar.bz2 -# Source2-md5: 37ff0144a673417c793d282d12aba6a1 -Source3: https://hg.openjdk.java.net/jdk-updates/jdk9u/jaxp/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-jaxp-%{version}.tar.bz2 -# Source3-md5: c6c4ee8ef80f10fc4fbc9d151436c89a -Source4: https://hg.openjdk.java.net/jdk-updates/jdk9u/jaxws/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-jaxws-%{version}.tar.bz2 -# Source4-md5: 3cf0375c3bba7d028c8408e41bbbb352 -Source5: https://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-jdk-%{version}.tar.bz2 -# Source5-md5: 74d33ad39f5b67596c5269585811cfab -Source6: https://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-langtools-%{version}.tar.bz2 -# Source6-md5: 95d7011a050602218b5400c632339e2c -Source7: https://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-nashorn-%{version}.tar.bz2 -# Source7-md5: 5fbaceceb82449806263ba99188b7139 +Source0: https://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-%{ver_u}+%{ver_b}.tar.bz2?/%{name}-%{version}.tar.bz2 +# Source0-md5: d216524203251f1378e660e6fda0b2ec Source10: make-cacerts.sh Patch0: libpath.patch Patch1: make-4.3.patch Patch2: x32.patch Patch3: aarch64.patch +Patch4: build.patch URL: http://openjdk.java.net/ BuildRequires: /usr/bin/jar BuildRequires: alsa-lib-devel @@ -83,7 +67,6 @@ BuildRequires: zip BuildRequires: zlib-devel Requires: %{name}-appletviewer = %{version}-%{release} Requires: %{name}-jdk = %{version}-%{release} -Suggests: %{name}-jre-X11 Suggests: icedtea-web Obsoletes: icedtea6 Obsoletes: icedtea7 @@ -140,8 +123,8 @@ Group: Development/Languages/Java Requires: %{name}-jar = %{version}-%{release} Requires: %{name}-jdk-base = %{version}-%{release} Requires: %{name}-jre = %{version}-%{release} -Provides: j2sdk = %{_jdkversion} -Provides: jdk = %{_jdkversion} +Provides: j2sdk = %{version} +Provides: jdk = %{version} Obsoletes: blackdown-java-sdk Obsoletes: ibm-java Obsoletes: icedtea6-jdk @@ -200,7 +183,7 @@ Provides: java(jmx) = 1.4 Provides: java(jndi) = %{version} Provides: java(jsse) = %{version} Provides: java1.4 -Provides: jre = %{_jdkversion} +Provides: jre = %{version} Obsoletes: icedtea6-jre Obsoletes: icedtea7-jre Obsoletes: java(jaas) @@ -229,26 +212,6 @@ uruchomieniowego OpenJDK, dostarczanych przez pakiet %{name}-jre-base, w standardowych systemowych ścieżkach takich jak %{_bindir}, sprawiając tym samym, że OpenJDK staje się domyślnym JRE w systemie. -%package jre-X11 -Summary: OpenJDK - runtime environment - X11 support -Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe - obsługa X11 -Group: Development/Languages/Java -Requires: %{name}-jre = %{version}-%{release} -Requires: %{name}-jre-base-X11 = %{version}-%{release} -Provides: jre-X11 = %{_jdkversion} -Obsoletes: icedtea6-jre-X11 -Obsoletes: icedtea7-jre-X11 -Obsoletes: java-sun-jre-X11 -Obsoletes: oracle-java7-jre-X11 - -%description jre-X11 -X11 support for OpenJDK runtime environment built using free software -only. - -%description jre-X11 -l pl.UTF-8 -Biblioteki X11 dla środowiska OpenJDK zbudowany wyłocznie przy uzyciu -wolnego oprogramowania. - %package jre-base Summary: OpenJDK - runtime environment Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe @@ -347,7 +310,6 @@ Summary: OpenJDK - appletviewer tool Summary(pl.UTF-8): OpenJDK - narzędzie appletviewer Group: Development/Languages/Java Requires: %{name}-jdk-base = %{version}-%{release} -Requires: %{name}-jre-X11 = %{version}-%{release} Obsoletes: icedtea6-appletviewer Obsoletes: icedtea7-appletviewer Obsoletes: java-sun-appletviewer @@ -391,11 +353,7 @@ Code examples for OpenJDK. Przykłady dla OpenJDK. %prep -%setup -qn jdk9u-jdk-%{ver_u}+%{ver_b} -a1 -a2 -a3 -a4 -a5 -a6 -a7 - -for d in *-jdk-%{ver_u}+%{ver_b}* ; do - mv "$d" "${d%%-jdk-%{ver_u}+%{ver_b}}" -done +%setup -qn jdk10u-jdk-%{ver_u}+%{ver_b} %patch0 -p1 %patch1 -p1 @@ -403,6 +361,7 @@ done %ifarch aarch64 %patch3 -p1 %endif +%patch4 -p1 %build # Make sure we have /proc mounted - otherwise idlc will fail later. @@ -411,7 +370,7 @@ if [ ! -f /proc/self/stat ]; then exit 1 fi -cd common/autoconf +cd make/autoconf rm generated-configure.sh %{__autoconf} -o generated-configure.sh cd ../.. @@ -446,7 +405,12 @@ chmod a+x configure --with-zlib=system \ --with-version-pre="" \ --with-version-opt="" \ - --with-version-build="%{release}" + --with-version-build="%{release}" \ + --with-vendor-name="PLD-Linux" \ + --with-vendor-url="https://www.pld-linux.org" \ + --with-vendor-bug-url="https://bugs.pld-linux.org" \ + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" \ + --with-vendor-version-string="%{version}" specdir="$(dirname build/*-release/spec.gmk)" cat > $specdir/custom-spec.gmk <