From b5a0113565a7cda04d8dd15f6169d3837099637b Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 17 Jan 2025 18:09:02 +0000 Subject: [PATCH] Transition to the devkit build by not defining pkgos - Exempt x86_64 from the static libs debuginfo test until portable uses an older DWARF version Resolves: RHEL-74403 --- java-21-openjdk.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 8e6725b..10098ab 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -356,7 +356,7 @@ # Define the OS the portable JDK is built on # This is undefined for CentOS & openjdk-portable-rhel-8 builds and # equals 'rhel7' for openjdk-portable-rhel-7 builds -%if 0%{?centos} == 0 +%if 0 %global pkgos rhel7 %endif @@ -366,9 +366,9 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 11 -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build -%global portablerelease 1 +%global portablerelease 2 # Portable suffix differs between RHEL and CentOS %if 0%{?centos} == 0 %global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8} @@ -2098,10 +2098,13 @@ if ! nm ${alt_java_binary} | grep prctl ; then true ; else false; fi %if %{include_staticlibs} # Check debug symbols in static libraries (smoke test) +# Temporary workaround for debuginfo failure on x86_64 with devkit build +%ifnarch x86_64 export STATIC_LIBS_HOME=${JAVA_HOME}/lib/static/linux-%{archinstall}/glibc readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c %endif +%endif so_suffix="so" # Check debug symbols are present and can identify code @@ -2532,6 +2535,11 @@ cjc.mainProgram(args) %endif %changelog +* Fri Jan 17 2025 Andrew Hughes - 1:21.0.5.0.11-3 +- Transition to the devkit build by not defining pkgos +- Exempt x86_64 from the static libs debuginfo test until portable uses an older DWARF version +- Resolves: RHEL-74403 + * Wed Oct 16 2024 Andrew Hughes - 1:21.0.5.0.11-2 - Update to jdk-21.0.5+11 (GA) - Update release notes to 21.0.5+11