Update to shenandoah-jdk-11.0.7+10 (GA)

Switch to GA mode for final release.
Remove JDK-8237879 backport as this was integrated upstream in jdk-11.0.7+10.
This commit is contained in:
Andrew John Hughes 2020-04-22 23:05:34 +01:00
parent 7752b4b9cf
commit 25107c4c5c
4 changed files with 10 additions and 50 deletions

2
.gitignore vendored
View File

@ -47,3 +47,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.7+9.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+10.tar.xz

View File

@ -225,7 +225,7 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 9 %global buildver 10
%global rpmrelease 0 %global rpmrelease 0
#%%global tagsuffix "" #%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
@ -243,7 +243,7 @@
# Release will be (where N is usually a number starting at 1): # Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases, # - 0.N%%{?extraver}%%{?dist} for EA releases,
# - N%%{?extraver}{?dist} for GA releases # - N%%{?extraver}{?dist} for GA releases
%global is_ga 0 %global is_ga 1
%if %{is_ga} %if %{is_ga}
%global ea_designator "" %global ea_designator ""
%global ea_designator_zip "" %global ea_designator_zip ""
@ -1064,18 +1064,6 @@ Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call # S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch Patch8: s390-8214206_fix.patch
#############################################
#
# Patches appearing in 11.0.7
#
# This section includes patches which are present
# in the listed OpenJDK 11u release and should be
# able to be removed once that release is out
# and used by this RPM.
#############################################
# JDK-8237879: make 4.3 breaks build
Patch9: jdk8237879-make_4_3_build_fixes.patch
############################################# #############################################
# #
# Patches appearing in 11.0.8 # Patches appearing in 11.0.8
@ -1324,7 +1312,6 @@ pushd %{top_level_dir_name}
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
popd # openjdk popd # openjdk
@ -1872,6 +1859,11 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Wed Apr 22 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.10-0
- Update to shenandoah-jdk-11.0.7+10 (GA)
- Switch to GA mode for final release.
- Remove JDK-8237879 backport as this was integrated upstream in jdk-11.0.7+10.
* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.9-0.0.ea * Tue Apr 21 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.9-0.0.ea
- Update to shenandoah-jdk-11.0.7+9 (EA) - Update to shenandoah-jdk-11.0.7+9 (EA)
- Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9. - Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9.

View File

@ -1,34 +0,0 @@
# HG changeset patch
# User ihse
# Date 1580378910 -3600
# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
# Parent 24b4c763cb2276db073bec263246879eb312daeb
8237879: make 4.3 breaks build
Reviewed-by: erikj, tbell
diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
--- a/make/common/MakeBase.gmk Thu Jan 30 10:10:48 2020 +0100
+++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
@@ -525,15 +525,16 @@
# Param 2 - (optional) name of file to store value in
DependOnVariableHelper = \
$(strip \
- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
+ $(call MakeDir, $(dir $($1_filename))) \
$(if $(findstring $(LOG_LEVEL), trace), \
$(info NewVariable $1: >$(strip $($1))<) \
$(info OldVariable $1: >$(strip $($1_old))<)) \
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
- $(call DependOnVariableFileName, $1, $2))) \
- $(call DependOnVariableFileName, $1, $2) \
+ $($1_filename))) \
+ $($1_filename) \
)
# Main macro

View File

@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz) = 7da1a4d8d906b7c1bfaf133d430cedde9670838d4d24606cedff6d8ab8f430cef9f83bb5ef438a38fc9ed294c1b4d724f6bd9a704a4f178340d92401db2450d1 SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz) = 469e7f43c131ba8970791fc9f7e84a13296943e8f68e80f27673b29e1837948f64ec3746a57b2aab9d508f8a038e7c3e4ae2d979b4d25e987093deeded0ebb70