From 881b56f45e7de24f899d40bfa9fbe625ed0f8a21 Mon Sep 17 00:00:00 2001
From: DXwangg <wangjiawei80@huawei.com>
Date: Wed, 7 Dec 2022 17:04:17 +0800
Subject: [PATCH] I64NFZ:Merge branch 'master' into openEuler-20.03-LTS-SP3

---
 openjdk-11.spec | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/openjdk-11.spec b/openjdk-11.spec
index e2b79aa..47102b3 100644
--- a/openjdk-11.spec
+++ b/openjdk-11.spec
@@ -651,7 +651,7 @@ Requires: lksctp-tools%{?_isa}
 # 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
@@ -846,7 +846,7 @@ Patch61: downgrade-the-symver-of-log2f-posix-spawn.patch
 Patch62: 8254078-DataOutputStream-is-very-slow-post-disabling.patch
 Patch65: add-LazyBox-feature.patch
 Patch66: add-G1-Full-GC-optimization.patch
-Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
+Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch 
 Patch69: G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
 
 # 11.0.11
@@ -1370,7 +1370,7 @@ done
 
 # Make sure gdb can do a backtrace based on line numbers on libjvm.so
 # javaCalls.cpp:58 should map to:
-# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58 
 # Using line number 1 might cause build problems. See:
 gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
 handle SIGSEGV pass nostop noprint
@@ -1498,9 +1498,9 @@ popd
 # end moving files to /etc
 
 # stabilize permissions
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 755 {} \; ;
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 755 {} \; ; 
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ; 
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ; 
 
 # end, dual install
 done
@@ -1514,7 +1514,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"
@@ -1543,8 +1549,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}}
@@ -1695,9 +1702,6 @@ require "copy_jdk_configs.lua"
 - delete fix_X509TrustManagerImpl_symantec_distrust.patch
 - add fix_Internal_and_external_code_inconsistency.patch
 
-* Tue May 31 2022 noah <hedongbo@huawei.com> - 1:11.0.15.10-2
-- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires
-
 * Thu Apr 28 2022 kuenking111 <wangkun49@huawei.com> - 1:11.0.15.10-1
 - add fix_X509TrustManagerImpl_symantec_distrust.patch
 
@@ -1845,7 +1849,7 @@ require "copy_jdk_configs.lua"
 - add 8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch
 
 * Mon Oct 26 2020 noah <hedongbo@huawei.com> - 1:11.0.9.11-1
-- add 8229495-SIGILL-in-C2-generated-OSR-compilation.patch
+- add 8229495-SIGILL-in-C2-generated-OSR-compilation.patch 
 
 * Thu Oct 22 2020 noah <hedongbo@huawei.com> - 1:11.0.9.11-0
 - Update to 11.0.9+11 (GA)
-- 
Gitee