rpms/java-21-openjdk
7
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-45217
This commit is contained in:
Andrew Hughes 2024-07-26 00:43:13 +01:00
parent 0ce8bb88bb
commit cc41f233ff
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java-21-openjdk.spec
View File

@ -227,7 +227,13 @@
%global hotspot_target hotspot %global hotspot_target hotspot
# 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
@ -1432,6 +1438,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
@ -2487,6 +2497,7 @@ cjc.mainProgram(args)
%changelog %changelog
* Fri Apr 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2 * Fri Apr 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2
- Define portablesuffix according to whether pkgos is defined or not - Define portablesuffix according to whether pkgos is defined or not
- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10
- Related: RHEL-45217 - Related: RHEL-45217
* Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1 * Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1