diff --git a/java-17-konajdk.spec b/java-17-konajdk.spec index 0d07395476ff05cb7010f723cfe5fb6780a299e1..e1f9b787a2368aaffca16c654ad41d4da80dd946 100644 --- a/java-17-konajdk.spec +++ b/java-17-konajdk.spec @@ -13,7 +13,7 @@ %global kona_url https://github.com/Tencent/TencentKona-%{majorver} # distro release extra infomation -%global rpmrelease 1 +%global rpmrelease 2 %global buildver 1 %global debug_level release %define debug_package %{nil} @@ -37,6 +37,9 @@ %ifarch loongarch64 %global sourcedir TencentKona-%{majorver}-%{tarname}-LoongArch %endif +%ifarch sw_64 +%global sourcedir TencentKona-%{majorver}-%{tarname}-sw_64 +%endif %global vendor_version_string TencentKonaJDK @@ -56,8 +59,11 @@ %ifarch loongarch64 %global jdkarch loongarch64 %endif +%ifarch sw_64 +%global jdkarch sw64 +%endif -%global sa_arches x86_64 %{aarch64} loongarch64 +%global sa_arches x86_64 %{aarch64} loongarch64 sw_64 # Standard JPackage directories and symbolic links. %if %{bootstrap} @@ -117,6 +123,8 @@ URL: %{kona_url} Source0: %{url}/archive/%{tarname}/%{tarname}.tar.gz # source code of Loongarch64 Source1: %{url}/archive/refs/tags/%{tarname}-LoongArch.tar.gz +# source code of sw_64 +Source2: %{tarname}-sw_64.tar.gz # bootstrap building, need prebuild binary # have not tested bootstrap building of konajdk 8/11/17 for x86 and arm %if %{bootstrap} @@ -134,6 +142,7 @@ Source12: https://ftp.loongnix.cn/Java/openjdk11/loongson11.13.21-fx-jdk11.0. Source10: https://github.com/Tencent/TencentKona-17/releases/download/TencentKona-17.0.14/TencentKona-17.0.14.b1-jdk_linux-x86_64.tar.gz Source11: https://github.com/Tencent/TencentKona-17/releases/download/TencentKona-17.0.14/TencentKona-17.0.14.b1-jdk_linux-aarch64.tar.gz Source12: https://ftp.loongnix.cn/Java/openjdk17/loongson17.13.21-fx-jdk17.0.14_7-linux-loongarch64-glibc2.34.tar.gz +Source13: jdk17-linux-sw_64.tar.gz %endif %if %{majorver} == 21 Source10: https://github.com/Tencent/TencentKona-21/releases/download/TencentKona-21.0.6/TencentKona-21.0.6.b1-jdk_linux-x86_64.tar.gz @@ -144,7 +153,7 @@ Source12: https://ftp.loongnix.cn/Java/openjdk21/loongson21.6.21-fx-jdk21.0.6 %if %{majorver} == 8 #Patch5000: konajdk-8.0.9-fix-gc-gcc12.patch %endif -ExclusiveArch: aarch64 x86_64 loongarch64 +ExclusiveArch: aarch64 x86_64 loongarch64 sw_64 %if ! %{bootstrap} BuildRequires: %{name}-devel @@ -322,6 +331,12 @@ JAVA %{majorver} API documentation compressed in a single archive. %autopatch -p1 %endif +%ifarch sw_64 +# only uncompress source2 +%setup -T -b 2 -n %{sourcedir} +%autopatch -p1 +%endif + chmod +x configure # root direcroty name is TencentKona-xx.xx.xx.b1 from kona # root direcroty name is jdk-xx.xx.xx from loongson @@ -342,6 +357,10 @@ SOURCE_TAR="%{SOURCE11}" SOURCE_TAR="%{SOURCE12}" %endif +%ifarch sw_64 +SOURCE_TAR="%{SOURCE13}" +%endif + tar axvf ${SOURCE_TAR} # get the root dir name of tar ROOT_DIR_NAME=$(tar -ztf ${SOURCE_TAR} | grep -E '^[^/]+/$' | sed 's/\/$//') @@ -359,7 +378,7 @@ mv ${ROOT_DIR_NAME} bootstrap-jdk export EXTRA_CFLAGS="%ourcppflags -Wno-error -Wno-error=maybe-uninitialized" export EXTRA_CPP_FLAGS="%ourcppflags -Wno-error=maybe-uninitialized" export EXTRA_ASFLAGS="${EXTRA_CFLAGS} -Wa,--generate-missing-build-notes=yes" -export SOURCEDIR="${pwd}" +export SOURCEDIR="${PWD}" # start to config and build jdk mkdir -p %{debug_level} @@ -389,6 +408,15 @@ bash ../configure \ --with-jvm-features=zgc \ %else --with-jvm-features=-zgc \ +%endif +%ifarch sw_64 + --enable-cds-archive=no \ + --enable-jvm-feature-cds=no \ + --enable-jvm-feature-compiler1=no \ + --enable-jvm-feature-epsilongc=no \ + --enable-jvm-feature-jfr=no \ + --enable-jvm-feature-jvmci=no \ + --enable-jvm-feature-shenandoahgc=no \ %endif --with-libjpeg=system \ --with-libpng=system \ @@ -1145,8 +1173,10 @@ post_state=$1 %{_jvmdir}/%{sdkdir}/bin/keytool %{_jvmdir}/%{sdkdir}/bin/rmiregistry %dir %{_jvmdir}/%{sdkdir}/lib -%ifarch %{sa_arches} +%ifnarch sw_64 %{_jvmdir}/%{sdkdir}/lib/classlist +%endif +%ifarch %{sa_arches} %{_jvmdir}/%{sdkdir}/lib/libsaproc.so %endif %{_jvmdir}/%{sdkdir}/lib/jexec @@ -1484,6 +1514,10 @@ post_state=$1 %changelog +* Fri Sep 26 2025 swcompiler - 17.0.16-2 +- enhancement +- Add sw_64 ISA support + * Tue Aug 05 2025 Zhao Zhen - 17.0.16-1 - Updated to upstream version 17.0.16 - Fixed CVE-2025-50059 CVE-2025-30749 CVE-2025-50106 CVE-2025-30754 diff --git a/sources b/sources index 405bd3fe9649fb04f487cb2f0c46945cafa5735e..df82355fb8419e91c32bba466d888b519a3ba152 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ SHA512 (TencentKona-17.0.16.tar.gz) = e11c92883d489c49a74e555829106a8cab7432fde57d5b73ee846bac5c5061f5836ebe5035da0045d6fd5f6c6cd1c9e63b7f26836d8115fe5008ea8274f4f281 SHA512 (TencentKona-17.0.16-LoongArch.tar.gz) = 2eb61fca1313f6196a75e222dfeb5b8dee5c3fdcf967f9a41f0392016643864036b99120e29176230348ab8bb440c7df13d30fee69615000f776ce709bac9f10 +SHA512 (TencentKona-17.0.16-sw_64.tar.gz) = b35bc45f5008bd3bfac8dcbc340d441d3fcb1a2b163839378dc96e8df2c367a55bbde32f6fc7f829a92b9e55bc2a6bfa0a261d01f4e199e068ebe050234386a8 +SHA512 (jdk17-linux-sw_64.tar.gz) = 9dc1f1548e52058baa480edd20a2b5d0d082849a9420a13b318f7b1651664a4d4ea78b869a068e8204f781056c2614ec99950f8bb9140e80fcb9da3be25ff6d8