From 047ec1d6b08122b6ceabac5f3313e839c613102d Mon Sep 17 00:00:00 2001 From: aoqi Date: Sat, 6 Jan 2024 15:42:42 +0800 Subject: [PATCH] custom jdk is no longer required on loongarch64 --- java-1.8.0-openjdk-portable.spec | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/java-1.8.0-openjdk-portable.spec b/java-1.8.0-openjdk-portable.spec index fa5404a..d085ff9 100644 --- a/java-1.8.0-openjdk-portable.spec +++ b/java-1.8.0-openjdk-portable.spec @@ -172,16 +172,7 @@ %else %global buildjdkver 1.8.0 %endif - -%ifarch loongarch64 -%global top_level_dir_boot_jdk loongsonbootjdk -%endif - -%ifnarch loongarch64 %global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk -%else -%global bootjdk loongsonbootjdk/jdk8u372-b07 -%endif # Filter out flags from the optflags macro that cause problems with the OpenJDK build # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2 @@ -490,9 +481,6 @@ Source17: nss.fips.cfg.in # Ensure translations are available for new timezones Source18: TestTranslations.java -# set loongson boot jdk -Source19: loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz - # Disabled in portables #Source20: repackReproduciblePolycies.sh @@ -702,12 +690,7 @@ BuildRequires: zip BuildRequires: tar BuildRequires: unzip # Require a boot JDK which doesn't fail due to RH1482244 -%ifnarch loongarch64 BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3 -%endif -%ifarch loongarch64 -BuildRequires: javapackages-filesystem -%endif # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -1230,14 +1213,6 @@ function packagejdk() { popd #images } -%ifarch loongarch64 -top_dir_abs_bootjdk=$(pwd)/%{top_level_dir_boot_jdk} -mkdir -p ${top_dir_abs_bootjdk} -pushd ${top_dir_abs_bootjdk} -tar -zxf %{SOURCE19} -popd -%endif - %if %{build_hotspot_first} # Build a fresh libjvm.so first and use it to bootstrap cp -LR --preserve=mode,timestamps %{bootjdk} newboot -- Gitee