I87OFZ:openjdk-1.8.0编译报错lua script failed
This commit is contained in:
parent
0b4352d125
commit
f3305a4729
@ -829,7 +829,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.9
|
||||
Requires: copy-jdk-configs >= 3.3
|
||||
OrderWithRequires: copy-jdk-configs
|
||||
# for printing support
|
||||
Requires: cups-libs
|
||||
@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}.%{buildver}
|
||||
Release: 10
|
||||
Release: 11
|
||||
# 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
|
||||
@ -2389,10 +2389,8 @@ 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)
|
||||
require "copy_jdk_configs.lua"
|
||||
|
||||
%post
|
||||
%{post_script %{nil}}
|
||||
@ -2529,6 +2527,9 @@ cjc.mainProgram(arg)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Oct 12 2023 DXwangg <wangjiawei80@huawei.com> - 1:1.8.0.382-b05.11
|
||||
- fix [EulerMaker] openjdk-1.8.0 build problem in openEuler-20.03-LTS-SP4:everything
|
||||
|
||||
* Mon Sep 25 2023 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.382-b05.10
|
||||
- del useless code
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user