!5 delete redundant patches
From: @jvmboy Reviewed-by: @jdkboy Signed-off-by: @jdkboy
This commit is contained in:
commit
6e6cb6ce21
@ -168,7 +168,7 @@
|
|||||||
%global top_level_dir_name %{origin}
|
%global top_level_dir_name %{origin}
|
||||||
%global minorver 0
|
%global minorver 0
|
||||||
%global buildver 36
|
%global buildver 36
|
||||||
%global rpmrelease 0
|
%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
|
# 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
|
%if %is_system_jdk
|
||||||
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
||||||
@ -1718,6 +1718,9 @@ require "copy_jdk_configs.lua"
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Oct 13 2020 noah <hedongbo@huawei.com> - 1:15.0.0.36-1.rolling
|
* Tue Oct 13 2020 noah <hedongbo@huawei.com> - 1:15.0.0.36-1.rolling
|
||||||
|
- delete redudant patches
|
||||||
|
|
||||||
|
* Tue Oct 13 2020 noah <hedongbo@huawei.com> - 1:15.0.0.36-0.rolling
|
||||||
- Update for JDK 15 GA
|
- Update for JDK 15 GA
|
||||||
|
|
||||||
* Thu Sep 17 2020 noah <hedongbo@huawei.com> - 1:15.0.0.36-0-1.ea.rolling
|
* Thu Sep 17 2020 noah <hedongbo@huawei.com> - 1:15.0.0.36-0-1.ea.rolling
|
||||||
|
|||||||
@ -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), \
|
|
||||||
Loading…
x
Reference in New Issue
Block a user