diff --git a/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz b/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz deleted file mode 100644 index 97497f21877a27197087695d2e198951f79c5d28..0000000000000000000000000000000000000000 Binary files a/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz and /dev/null differ diff --git a/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz b/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz deleted file mode 100644 index 18b1622cde2f556d6916c2fa9429ab40975542bc..0000000000000000000000000000000000000000 Binary files a/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz and /dev/null differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 40aa8559ce4042e951abf4167f89286456933bc5..b15c2335877b2edf8db22ee38803f4b42c082754 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -22,6 +22,9 @@ # Enable release builds by default on relevant arches. %bcond_without release +# Disable global LTO +%define _lto_cflags %{nil} + # The -g flag says to use strip -g instead of full strip on DSOs or EXEs. # This fixes detailed NMT and other tools which need minimal debug info. %global _find_debuginfo_opts -g @@ -162,7 +165,7 @@ # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place -%global buildjdkver 23 +%global buildjdkver %{majorver} # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} @@ -179,7 +182,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 11 -%global rpmrelease 1 +%global rpmrelease 3 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -898,7 +901,7 @@ Name: java-latest-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 1 +Release: %{rpmrelease} # 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 @@ -934,8 +937,6 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz -Source1: OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz -Source2: OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1334,18 +1335,13 @@ fi ARCH=$(uname -m) BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk -if [ "$ARCH" = "x86_64" ]; then - tar -xf %{SOURCE2} - BOOTJDKPATH=$PWD/jdk-23.0.1+11 -elif [ "$ARCH" = "aarch64" ]; then - tar -xf %{SOURCE1} - BOOTJDKPATH=$PWD/jdk-23.0.1+11 -elif [ "$ARCH" = "riscv64" ]; then - : -elif [ "$ARCH" = "loongarch64" ]; then - : -elif [ "$ARCH" = "ppc64le" ]; then +# In time of bootstrap of next jdk, we may use +# majorver-1 as bootjdkver. +BOOTSTRAP_BOOTJDKPATH=/usr/lib/jvm/java-$(expr %{buildjdkver} - 1)-openjdk +if [ -d "$BOOTJDKPATH" ]; then : +elif [ -d "$BOOTSTRAP_BOOTJDKPATH" ]; then + BOOTJDKPATH=$BOOTSTRAP_BOOTJDKPATH else echo " Failed to set BOOTJDKPATH " exit 18 @@ -1802,6 +1798,13 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Wed Mar 26 2025 Whitney33 - 1:23.0.1.11-3 +- fix condigure arguments, disable global lto + +* Thu Nov 28 2024 Dingli Zhang - 1:23.0.1.11-2.rolling +- Adopt suitable buildjdkver to build by itself +- Modify release and rpmrelease in spec + * Fri Nov 22 2024 Dingli Zhang - 1:23.0.1.11-1 - Modify bootjdk for riscv64 - Backport JDK-8332854