July 2020 CPU
Update to 14.0.2+12 sources Remove upstreamed patches jdk8237879-make_4_3_build_fixes.patch, jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch, jdk8243059-build_fails_when_with_vendor_contains_comma.patch
This commit is contained in:
Petra Mikova
parent
f8b9b4d90e
commit
a3e31f598f
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
||||
/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
|
||||
/jdk-jdk14-jdk-14+36.tar.xz
|
||||
/jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
|
||||
/jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
|
||||
|
||||
@ -204,7 +204,7 @@
|
||||
# Used via new version scheme. JDK 14 was
|
||||
# GA'ed in March 2020 => 20.3
|
||||
%global vendor_version_string 20.3
|
||||
%global securityver 1
|
||||
%global securityver 2
|
||||
# buildjdkver is usually same as %%{majorver},
|
||||
# but in time of bootstrap of next jdk, it is majorver-1,
|
||||
# and this it is better to change it here, on single place
|
||||
@ -219,8 +219,8 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 7
|
||||
%global rpmrelease 4
|
||||
%global buildver 12
|
||||
%global rpmrelease 1
|
||||
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
||||
@ -1055,15 +1055,6 @@ Patch4: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
|
||||
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
||||
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||
|
||||
|
||||
#############################################
|
||||
#
|
||||
# OpenJDK patches appearing in 14.0.2
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8237879: make 4.3 breaks build
|
||||
Patch7: jdk8237879-make_4_3_build_fixes.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1071,8 +1062,6 @@ Patch7: jdk8237879-make_4_3_build_fixes.patch
|
||||
#
|
||||
#############################################
|
||||
|
||||
Patch8: jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
||||
Patch9: jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -1299,9 +1288,6 @@ pushd %{top_level_dir_name}
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
popd # openjdk
|
||||
|
||||
%patch1000
|
||||
@ -1847,6 +1833,12 @@ require "copy_jdk_configs.lua"
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 22 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.2.12-1.rolling
|
||||
- update to jdk 14.0.2.12 CPU version
|
||||
- remove upstreamed patch jdk8237879-make_4_3_build_fixes.patch
|
||||
- remove upstreamed patch jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch
|
||||
- remove upstreamed patch jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
||||
|
||||
* Thu Jul 09 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:14.0.1.7-4.rolling
|
||||
- Re-introduce java-openjdk-src & java-openjdk-demo for system_jdk builds.
|
||||
- Fix accidental renaming of java-openjdk-devel to java-devel-openjdk.
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff --git a/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp b/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
|
||||
--- a/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
|
||||
+++ b/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
|
||||
@@ -33,7 +33,6 @@
|
||||
#include <stdbool.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <sys/sysctl.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
@ -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
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
|
||||
--- a/make/launcher/LauncherCommon.gmk
|
||||
+++ b/make/launcher/LauncherCommon.gmk
|
||||
@@ -139,7 +139,7 @@
|
||||
OPTIMIZATION := $$($1_OPTIMIZATION), \
|
||||
CFLAGS := $$(CFLAGS_JDKEXE) \
|
||||
$(LAUNCHER_CFLAGS) \
|
||||
- $(VERSION_CFLAGS) \
|
||||
+ $(subst $(COMMA),$(DOLLAR)(COMMA),$(VERSION_CFLAGS)) \
|
||||
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
|
||||
-DPROGNAME='"$1"' \
|
||||
$$($1_CFLAGS), \
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357
|
||||
SHA512 (jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz) = c347bafb3d69fa6ddb43b4d693a2ec9994107446bf67215081dd009fef4e13b3fec3eb2efc88f7dd5eabc2c121b39d88bffa93983660490192e1c2d86bfb6348
|
||||
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user