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

Remove devtoolset

Browse Source
This commit is contained in:
eabdullin 2023-11-07 18:39:18 +03:00
parent 92d04d2746
commit 3e247cf36d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SOURCES/java-21-openjdk-portable.specfile
View File

@ -229,9 +229,6 @@
# Target to use to just build HotSpot # Target to use to just build HotSpot
%global hotspot_target hotspot %global hotspot_target hotspot
# DTS toolset to use to provide gcc & binutils
%global dtsversion 10
# Disable LTO as this causes build failures at the moment. # Disable LTO as this causes build failures at the moment.
# See RHBZ#1861401 # See RHBZ#1861401
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
@ -682,8 +679,7 @@ BuildRequires: desktop-file-utils
BuildRequires: elfutils-devel BuildRequires: elfutils-devel
BuildRequires: file BuildRequires: file
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: devtoolset-%{dtsversion}-gcc BuildRequires: gcc
BuildRequires: devtoolset-%{dtsversion}-gcc-c++
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gdb BuildRequires: gdb
BuildRequires: libxslt BuildRequires: libxslt
@ -1065,7 +1061,7 @@ function buildjdk() {
# rather than ${link_opt} as the system versions # rather than ${link_opt} as the system versions
# are always used in a system_libs build, even # are always used in a system_libs build, even
# for the static library build # for the static library build
scl enable devtoolset-%{dtsversion} "bash ${top_dir_abs_src_path}/configure \ bash ${top_dir_abs_src_path}/configure \
%ifarch %{zero_arches} %ifarch %{zero_arches}
--with-jvm-variants=zero \ --with-jvm-variants=zero \
%endif %endif
@ -1106,8 +1102,8 @@ function buildjdk() {
--disable-warnings-as-errors" --disable-warnings-as-errors"
cat spec.gmk cat spec.gmk
scl enable devtoolset-%{dtsversion} "make LOG=trace $maketargets || \ make LOG=trace $maketargets || \
( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )" ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )
popd popd
} }
@ -1126,9 +1122,9 @@ function stripjdk() {
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
if file ${file} | grep -q 'ELF'; then if file ${file} | grep -q 'ELF'; then
noextfile=${file/.so/}; noextfile=${file/.so/};
scl enable devtoolset-%{dtsversion} "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo"; objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
scl enable devtoolset-%{dtsversion} "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}"; objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
scl enable devtoolset-%{dtsversion} "strip -g ${file}"; strip -g ${file};
fi fi
done done