rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to aarch64-shenandoah-jdk8u262-b03.

Browse Source 
Remove JDK-8244461 & JDK-8233880 backports included upstream in b03.
This commit is contained in:
Andrew Hughes 2020-06-28 19:18:23 +00:00
parent 2e4f5f7362
commit 9c5c3ce478
5 changed files with 7 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -183,3 +183,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b09.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b01-4curve.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b02-4curve.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b03-4curve.tar.xz

12
java-1.8.0-openjdk.spec
View File

@ -229,7 +229,7 @@
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
%global shenandoah_revision aarch64-shenandoah-jdk8u262-b02
%global shenandoah_revision aarch64-shenandoah-jdk8u262-b03
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@ -1138,8 +1138,6 @@ Patch401: pr3655-toggle_system_crypto_policy.patch
# JDK-8218811: replace open by os::open in hotspot coding
# This fixes a GCC 10 build issue
Patch111: jdk8218811-perfMemory_linux.patch
# JDK-8244461: [JDK 8u] Build fails with glibc 2.32
Patch113: jdk8244461-remove_unused_sysctl.h.patch
#############################################
#
@ -1199,8 +1197,6 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# able to be removed once that release is out
# and used by this RPM.
#############################################
# JDK-8233880: Support compilers with multi-digit major version numbers
Patch579: jdk8233880-compiler_versioning.patch
#############################################
#
@ -1570,8 +1566,6 @@ sh %{SOURCE12}
%patch575
%patch577
%patch111
%patch113
%patch579
# RPM-only fixes
%patch539
@ -2240,6 +2234,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Tue Jun 23 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.262.b03-0.0.ea
- Update to aarch64-shenandoah-jdk8u262-b03.
- Remove JDK-8244461 & JDK-8233880 backports included upstream in b03.
* Mon Jun 22 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.262.b02-0.0.ea
- Update to aarch64-shenandoah-jdk8u262-b02.

22
jdk8233880-compiler_versioning.patch
View File

@ -1,22 +0,0 @@
# HG changeset patch
# User sgehwolf
# Date 1589215018 -3600
# Mon May 11 17:36:58 2020 +0100
# Node ID 39a7914e14a0c73ecc80091724c833b9f0410d47
# Parent 493a0176587ec5917ab4a64c0760a131e9d0b7b4
8233880: Support compilers with multi-digit major version numbers
Summary: Also includes JDK-8151841 version changes regressed by JDK-8034788
Reviewed-by: aph, andrew
diff --git openjdk.orig/common/autoconf/toolchain.m4 openjdk/common/autoconf/toolchain.m4
--- openjdk.orig/common/autoconf/toolchain.m4
+++ openjdk/common/autoconf/toolchain.m4
@@ -433,7 +433,7 @@
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *Copyright .*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
+ $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
elif test "x$TOOLCHAIN_TYPE" = xclang; then
# clang --version output typically looks like
# Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)

22
jdk8244461-remove_unused_sysctl.h.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/src/solaris/native/java/net/PlainDatagramSocketImpl.c
--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -41,7 +41,6 @@
#endif
#ifdef __linux__
#include <unistd.h>
-#include <sys/sysctl.h>
#include <sys/utsname.h>
#include <netinet/ip.h>
diff --git a/src/solaris/native/java/net/PlainSocketImpl.c b/src/solaris/native/java/net/PlainSocketImpl.c
--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
@@ -43,7 +43,6 @@
#endif
#ifdef __linux__
#include <unistd.h>
-#include <sys/sysctl.h>
#endif
#include "jvm.h"

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b02-4curve.tar.xz) = bf545d0f860ab09129a92720668eef0c1f761fa3badde9dc70ad8ea03d434b9172b85a84672cf66817cf359b65367cf6baddffbe5e3564ae6a1f1bc28030b112
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b03-4curve.tar.xz) = 44e2665ead02abd6b3b026f5ca703ec21b75873e291e65d9761a8379a83359a7c96a28767971eb448b10dde99b0d01799efd87731d2e1f51f829809f83109e3c