I64N5R:Merge branch 'master' into openEuler-20.03-LTS-SP3

Huawei-fix-windows-build-Dynamic-CDS-failure.patch

@@ -0,0 +1,44 @@
+From 90eec1e71cb818dae6d0ed1be7f7a7c3fe9da1cf Mon Sep 17 00:00:00 2001
+From: zhangyipeng <zhangyipeng7@huawei.com>
+Date: Fri, 21 Oct 2022 11:24:48 +0800
+Subject: [PATCH] fix windows build Dynamic CDS failure
+
+---
+ hotspot/make/windows/makefiles/vm.make | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/hotspot/make/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make
+index e303da77b..5322a4b4b 100644
+--- a/hotspot/make/windows/makefiles/vm.make
++++ b/hotspot/make/windows/makefiles/vm.make
+@@ -148,6 +148,7 @@ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code
+ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter
+ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/ci
+ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/classfile
++VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/cds
+ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parallelScavenge
+ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/shared
+ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parNew
+@@ -233,6 +234,9 @@ arguments.obj: $(WorkSpace)\src\share\vm\runtime\arguments.cpp
+ {$(COMMONSRC)\share\vm\classfile}.cpp.obj::
+         $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
+ 
++{$(COMMONSRC)\share\vm\cds}.cpp.obj::
++        $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
++
+ {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
+         $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
+ 
+@@ -316,6 +320,9 @@ arguments.obj: $(WorkSpace)\src\share\vm\runtime\arguments.cpp
+ {$(ALTSRC)\share\vm\classfile}.cpp.obj::
+         $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
+ 
++{$(ALTSRC)\share\vm\cds}.cpp.obj::
++        $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
++
+ {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
+         $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
+ 
+-- 
+2.22.0
+

openjdk-1.8.0.spec

@@ -820,7 +820,7 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION}
 # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
 # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
 # considered as regression
-Requires: copy-jdk-configs >= 3.3
+Requires: copy-jdk-configs >= 3.9
 OrderWithRequires: copy-jdk-configs
 # for printing support
 Requires: cups-libs
@@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 3
+Release: 4
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -1152,6 +1152,7 @@ Patch264: 8287109-Distrust-failed-with-CertificateExpired.patch
 # 8u352
 Patch265: cve-2022-37434-Fix-a-bug-when-getting-a-gzip-header-extra-field-with-inflate.patch
 Patch266: 8065895-Synchronous-signals-during-error-reporting-may-terminate-or-hang-vm-process.patch
+Patch267: Huawei-fix-windows-build-Dynamic-CDS-failure.patch
 
 #############################################
 #
@@ -1213,7 +1214,6 @@ BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 # elfutils only are OK for build without AOT
 BuildRequires: elfutils-devel
-#BuildRequires: elfutils-extra
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
 BuildRequires: giflib-devel
@@ -1644,6 +1644,7 @@ pushd %{top_level_dir_name}
 %patch264 -p1
 %patch265 -p1
 %patch266 -p1
+%patch267 -p1
 popd
 
 # System library fixes
@@ -2094,7 +2095,13 @@ done
 -- whether copy-jdk-configs is installed or not. If so, then configs are copied
 -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
 local posix = require "posix"
-local debug = false
+
+if (os.getenv("debug") == "true") then
+  debug = true;
+  print("cjc: in spec debug is on")
+else
+  debug = false;
+end
 
 SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
 SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
@@ -2123,8 +2130,9 @@ else
   end
 end
 -- run content of included file with fake args
+cjc = require "copy_jdk_configs.lua"
 arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-require "copy_jdk_configs.lua"
+cjc.mainProgram(arg)
 
 %post
 %{post_script %{nil}}
@@ -2261,6 +2269,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Oct 25 2022 kuenking111<wangkun49@huawei.com> - 1:1.8.0.352-b08.4
+- add Huawei-fix-windows-build-Dynamic-CDS-failure.patch
+
 * Mon Oct 24 2022 kuenking111<wangkun49@huawei.com> - 1:1.8.0.352-b08.3
 - add 8065895-Synchronous-signals-during-error-reporting-may-terminate-or-hang-vm-process.patch