From 2ceb39a01f6490f482cb961dedd830a9ce8ee6f5 Mon Sep 17 00:00:00 2001 From: dongbohe Date: Sat, 2 Sep 2023 09:59:52 +0800 Subject: [PATCH] =?UTF-8?q?I7XX6A:=E3=80=90arm\x86=E3=80=91java-latest-ope?= =?UTF-8?q?njdk-headless=E5=92=8Cjava-latest-openjdk-devel=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openjdk-latest.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 79021e2..c58366c 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -176,7 +176,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 9 -%global rpmrelease 1 +%global rpmrelease 2 # 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} ) @@ -786,7 +786,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 >= 3.9 +Requires: copy-jdk-configs >= 3.3 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -1007,7 +1007,7 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: zip BuildRequires: javapackages-filesystem -BuildRequires: java-latest-openjdk-devel +# BuildRequires: java-latest-openjdk-devel # Zero-assembler build requirement %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -1477,7 +1477,7 @@ EOF #grep 'JavaCallWrapper::JavaCallWrapper' gdb.out # Check src.zip has all sources. See RHBZ#1130490 -jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' +$JAVA_HOME/bin/jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' # Check class files include useful debugging information $JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from" @@ -1607,12 +1607,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" @@ -1640,8 +1635,6 @@ else return 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) @@ -1768,6 +1761,9 @@ cjc.mainProgram(arg) %changelog +* Sat Sep 2 2023 noah - 1:20.0.2.9-2-rolling +- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction + * Mon Aug 07 2023 misaka00251 - 1:20.0.2.9-1-rolling - Add riscv64 to jit_arches -- Gitee