!74 修复Loongarch架构下构建错误的问题和jdk的loongarch vendor信息
From: @sworn Reviewed-by: @kuenking111 Signed-off-by: @kuenking111
This commit is contained in:
commit
f54f877545
File diff suppressed because it is too large
Load Diff
@ -176,7 +176,11 @@
|
||||
%global lts_designator_zip ""
|
||||
%endif
|
||||
|
||||
%ifarch loongarch64
|
||||
%global vendor_version_string Loongson
|
||||
%else
|
||||
%global vendor_version_string BiSheng
|
||||
%endif
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
@ -893,7 +897,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 0
|
||||
Release: 1
|
||||
|
||||
# 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
|
||||
@ -1381,19 +1385,12 @@ bash ../configure \
|
||||
--with-version-build=%{buildver} \
|
||||
--with-version-pre=\"${EA_DESIGNATOR}\" \
|
||||
--with-version-opt=%{lts_designator} \
|
||||
%ifnarch loongarch64
|
||||
--with-vendor-version-string="%{vendor_version_string}" \
|
||||
--with-vendor-name="openEuler Community" \
|
||||
%endif
|
||||
%if "%toolchain" == "clang"
|
||||
--with-toolchain-type=clang \
|
||||
%endif
|
||||
--with-vendor-url="https://openeuler.org/" \
|
||||
--with-vendor-bug-url="%{bug_url}" \
|
||||
--with-vendor-vm-bug-url="%{bug_url}" \
|
||||
--with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-17/issues/" \
|
||||
--with-vendor-vm-bug-url="https://gitee.com/src-openeuler/openjdk-17/issues/" \
|
||||
--with-vendor-name="BiSheng" \
|
||||
--with-vendor-version-string="%{vendor_version_string}" \
|
||||
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
|
||||
--with-debug-level=$debugbuild \
|
||||
@ -1410,7 +1407,12 @@ bash ../configure \
|
||||
--with-num-cores="$NUM_PROC" \
|
||||
--with-source-date="${SOURCE_DATE_EPOCH}" \
|
||||
--disable-javac-server \
|
||||
--disable-warnings-as-errors
|
||||
--disable-warnings-as-errors \
|
||||
%ifarch loongarch64
|
||||
--with-vendor-name="Loongson" \
|
||||
%else
|
||||
--with-vendor-name="BiSheng" \
|
||||
%endif
|
||||
|
||||
# Debug builds don't need same targets as release for
|
||||
# build speed-up
|
||||
@ -1820,6 +1822,10 @@ cjc.mainProgram(arg)
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 16 2024 songliyang <songliyang@kylinos.cn> - 1:17.0.11.9-1
|
||||
- rewrite LoongArch64-support.patch to sovle error while applying this patch in prep stage
|
||||
- fix loongarch vendor error and delete redundant vendor args
|
||||
|
||||
* Thu Apr 18 2024 Autistic_boyya <wangzhongyi7@huawei.com> - 1:17.0.11.9-0.rolling
|
||||
- del 8295068-SSLEngine-throws-NPE-parsing-CertificateRequ.patch
|
||||
- modify puyuan-jdk17.0.9-patch.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user