rpms/java-21-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Transition to the devkit build by not defining pkgos

Browse Source 
- Exempt x86_64 from the static libs debuginfo test until portable uses an older DWARF version

Resolves: RHEL-74407
This commit is contained in:
Andrew Hughes 2025-01-17 18:09:02 +00:00
parent 6795e0a2dc
commit 441f26275f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java-21-openjdk.spec
View File

@ -356,7 +356,7 @@
# Define the OS the portable JDK is built on # Define the OS the portable JDK is built on
# This is undefined for CentOS & openjdk-portable-rhel-8 builds and # This is undefined for CentOS & openjdk-portable-rhel-8 builds and
# equals 'rhel7' for openjdk-portable-rhel-7 builds # equals 'rhel7' for openjdk-portable-rhel-7 builds
%if 0%{?centos} == 0 %if 0
%global pkgos rhel7 %global pkgos rhel7
%endif %endif
@ -366,9 +366,9 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 11 %global buildver 11
%global rpmrelease 5 %global rpmrelease 6
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 2
# Portable suffix differs between RHEL and CentOS # Portable suffix differs between RHEL and CentOS
%if 0%{?centos} == 0 %if 0%{?centos} == 0
%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8} %global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8}
@ -1983,10 +1983,13 @@ if ! nm ${alt_java_binary} | grep prctl ; then true ; else false; fi
%if %{include_staticlibs} %if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test) # 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 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 Inet4AddressImpl.c
readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
%endif %endif
%endif
so_suffix="so" so_suffix="so"
# Check debug symbols are present and can identify code # Check debug symbols are present and can identify code
@ -2422,6 +2425,11 @@ exit 0
%endif %endif
%changelog %changelog
* Thu Feb 06 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.11-6
- 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-74407
* Thu Jan 23 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.5.0.11-5 * Thu Jan 23 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.5.0.11-5
- Document rationale for gtk-update-icon-cache being in posttrans - Document rationale for gtk-update-icon-cache being in posttrans
- Remove extra spaces in posttrans files section headers - Remove extra spaces in posttrans files section headers