From 5c09ab5c268b70275ed124a7edabf110637e7e0f Mon Sep 17 00:00:00 2001 From: DXwangg Date: Thu, 12 Oct 2023 20:21:31 +0800 Subject: [PATCH] I87OFY:[EulerMaker] openjdk-17 build problem in openEuler-20.03-LTS-SP4:everything --- openjdk-17.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openjdk-17.spec b/openjdk-17.spec index ba697a5..dfbdde4 100644 --- a/openjdk-17.spec +++ b/openjdk-17.spec @@ -787,7 +787,7 @@ Requires: tzdata-java >= 2015d # 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 >= 4.0 +Requires: copy-jdk-configs >= 3.3 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -891,7 +891,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2 +Release: 3 # 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 @@ -1660,12 +1660,7 @@ done -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all local posix = require "posix" -if (os.getenv("debug") == "true") then - debug = true; - print("cjc: in spec debug is on") -else - debug = false; -end +local debug=false SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -1694,9 +1689,8 @@ 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}"} -cjc.mainProgram(arg) +require "copy_jdk_configs.lua" %post %{post_script %{nil}} @@ -1821,6 +1815,9 @@ cjc.mainProgram(arg) %changelog +* Thu Oct 12 2023 DXwangg - 1:17.0.8.7-3 +- fix [EulerMaker] openjdk-17 build problem in openEuler-20.03-LTS-SP4:everything + * Mon Sep 25 2023 kuenking111 - 1:17.0.8.7-2 - add add-Parallel-Full-gc-mark-stack-draining-should.patch - add add-8271579-G1-Move-copy-before-CAS-in-do_copy.patch -- Gitee