!81 I3IGOK: Resolve code inconsistencies

From: @kuenking111
Reviewed-by: @jvmboy
Signed-off-by: @jvmboy
This commit is contained in:
openeuler-ci-bot 2021-04-15 11:12:00 +08:00 committed by Gitee
commit 2ce3a3c3b4
2 changed files with 1312 additions and 2 deletions

View File

@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 6 Release: 7
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -854,6 +854,7 @@ Patch64: Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch
Patch65: add-LazyBox-feature.patch Patch65: add-LazyBox-feature.patch
Patch66: add-G1-Full-GC-optimization.patch Patch66: add-G1-Full-GC-optimization.patch
Patch67: 8214535-support-Jmap-parallel.patch Patch67: 8214535-support-Jmap-parallel.patch
Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -1131,9 +1132,10 @@ pushd %{top_level_dir_name}
%patch65 -p1 %patch65 -p1
%patch66 -p1 %patch66 -p1
%patch67 -p1 %patch67 -p1
%patch68 -p1
popd # openjdk popd # openjdk
%patch1000 # %patch1000
# Extract systemtap tapsets # Extract systemtap tapsets
%if %{with_systemtap} %if %{with_systemtap}
@ -1634,6 +1636,9 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Tue Apr 13 2021 kuenking <wangkun49@huawei.com> - 1:11.0.10.9-7
- add src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
* Fri Mar 19 2021 aijm <aijiaming1@huawei.com> - 1:11.0.10.9-6 * Fri Mar 19 2021 aijm <aijiaming1@huawei.com> - 1:11.0.10.9-6
- add 8214535-support-Jmap-parallel.patch - add 8214535-support-Jmap-parallel.patch

File diff suppressed because it is too large Load Diff