From a6330a35c6a86cd646eef7b9ccf50590a11b7f12 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 19 Jan 2025 13:05:33 +0000 Subject: [PATCH] Revert "Remove x86_64 debuginfo workaround which should no longer be needed" This reverts commit c79d060a3cbe1cbd59938451a7e95e3ac0a2fb11. Related: RHEL-74404 --- java-21-openjdk.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index a6ab95d..59c632b 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -2121,10 +2121,12 @@ 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 @@ -2563,7 +2565,6 @@ require "copy_jdk_configs.lua" - Update release notes to 21.0.6+7 - Sync the copy of the portable & devkit specfiles with the latest update - Include the latest devkit patches -- Remove x86_64 debuginfo workaround which should no longer be needed - Update README.md to list an easier way of disabling the devkit - ** This tarball is embargoed until 2025-01-21 @ 1pm PT. ** - Resolves: RHEL-73549