rpms/java-17-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10

Browse Source 
Related: RHEL-45216
This commit is contained in:
Andrew Hughes 2024-07-26 00:43:13 +01:00
parent 62330df1bf
commit 4a95eb8669
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java-17-openjdk.spec
View File

@ -236,7 +236,13 @@
%global vm_variant server %global vm_variant server
# debugedit tool for rewriting ELF file paths # debugedit tool for rewriting ELF file paths
%if 0%{?rhel} >= 10
# From RHEL 10, the tool is in its own package installed in the usual location
%global debugedit %{_bindir}/debugedit
%else
# On earlier versions of RHEL, it is part of the rpm package
%global debugedit %{_rpmconfigdir}/debugedit %global debugedit %{_rpmconfigdir}/debugedit
%endif
# Filter out flags from the optflags macro that cause problems with the OpenJDK build # 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 # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
@ -1416,6 +1422,10 @@ BuildRequires: automake
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: binutils BuildRequires: binutils
BuildRequires: cups-devel BuildRequires: cups-devel
# From RHEL 10, debugedit is in its own package
%if 0%{?rhel} >= 10
BuildRequires: debugedit
%endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT # elfutils only are OK for build without AOT
BuildRequires: elfutils-devel BuildRequires: elfutils-devel
@ -2489,8 +2499,10 @@ cjc.mainProgram(args)
* Wed Jul 31 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.11.0.9-2 * Wed Jul 31 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.11.0.9-2
- Fix gating.yaml to reference RHEL 10 - Fix gating.yaml to reference RHEL 10
- Set this to *not* be the default/system JDK providing 'java', 'jre', 'java-devel' ,etc. - Set this to *not* be the default/system JDK providing 'java', 'jre', 'java-devel' ,etc.
- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10
- Resolves: RHEL-45722 - Resolves: RHEL-45722
- Resolves: RHEL-51870 - Resolves: RHEL-51870
- Related: RHEL-45216
* Thu Apr 11 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.9-2 * Thu Apr 11 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.9-2
- Update to jdk-17.0.11+9 (GA) - Update to jdk-17.0.11+9 (GA)