rpms/java-17-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not pass nil to _jvmdir macro in cjc logic

Browse Source 
- Do not pass nil to _jvmdir macro in cjc logic
- Related: RHEL-73867

Eliminate this rpmbuild warning:
warning: java-17-openjdk.spec: line 2305: unexpected argument to non-parametric macro %_jvmdir
This commit is contained in:
Thomas Fitzsimmons 2025-01-14 17:41:15 -05:00
parent b0e7dd0301
commit e77b268991
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java-17-openjdk.spec
View File

@ -2302,7 +2302,7 @@ else
end
arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
cjc = require "copy_jdk_configs.lua"
args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
cjc.mainProgram(args)
%post
@ -2499,6 +2499,10 @@ cjc.mainProgram(args)
%endif
%changelog
* Tue Jan 14 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.14.0.7-2
- Do not pass nil to _jvmdir macro in cjc logic
- Related: RHEL-73867
* Mon Jan 13 2025 Jiri Vanek <jvanek@redhat.com> - 1:17.0.14.0.7-2
- Adapt to newest cjc to fix issue with rpm 4.17
- Disable copy-jdk-configs for Flatpak builds