rpms-test/java-17-openjdk
Watch
1
0
Fork
You've already forked java-17-openjdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly exclude x86, as on RHEL RPMs

Browse source 
Remove remaining traces of devtoolset
This commit is contained in:
Andrew Hughes 2023-04-20 18:06:36 +01:00
commit eb2209e4e7
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
java-17-openjdk.spec
View file

@ -505,6 +505,9 @@
%global tapsetdir %{tapsetdirttapset}/%{stapinstall} %global tapsetdir %{tapsetdirttapset}/%{stapinstall}
%endif %endif
# x86 is not supported by OpenJDK 17
ExcludeArch: %{ix86}
# Portables have no repo (requires/provides), but these are awesome for orientation in spec # Portables have no repo (requires/provides), but these are awesome for orientation in spec
# Also scriptlets are happily missing and files are handled old fashion # Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages # not-duplicated requires/provides/obsoletes for normal/debug packages
@ -717,7 +720,7 @@ BuildRequires: tar
BuildRequires: unzip BuildRequires: unzip
# No javapackages-filesystem on el7,nor is needed for portables # No javapackages-filesystem on el7,nor is needed for portables
# BuildRequires: javapackages-filesystem # BuildRequires: javapackages-filesystem
BuildRequires: java-%%{buildjdkver}-openjdk-devel BuildRequires: java-%{buildjdkver}-openjdk-devel
# Zero-assembler build requirement # Zero-assembler build requirement
%ifarch %{zero_arches} %ifarch %{zero_arches}
BuildRequires: libffi-devel BuildRequires: libffi-devel
@ -1120,12 +1123,13 @@ function buildjdk() {
%ifarch %{zgc_arches} %ifarch %{zgc_arches}
--with-jvm-features=zgc \ --with-jvm-features=zgc \
%endif %endif
--disable-warnings-as-errors" --disable-warnings-as-errors
cat spec.gmk cat spec.gmk
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
} }
function installjdk() { function installjdk() {
@ -1251,9 +1255,9 @@ function packagejdk() {
for file in $(find ${jdkname} ${jrename} -type f) ; do for file in $(find ${jdkname} ${jrename} -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-8 "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo"; objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
scl enable devtoolset-8 "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}"; objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
scl enable devtoolset-8 "strip -g ${file}"; strip -g ${file};
fi fi
done done
@ -1661,6 +1665,7 @@ done
- Sync with existing RHEL 8 build, in order to start building portables on RHEL 8 - Sync with existing RHEL 8 build, in order to start building portables on RHEL 8
- Restore system bootstrap JDK (RHEL 8 has java-17-openjdk) - Restore system bootstrap JDK (RHEL 8 has java-17-openjdk)
- Remove use of devtoolset (RHEL 8 native compilers should be sufficient) - Remove use of devtoolset (RHEL 8 native compilers should be sufficient)
- Explicitly exclude x86, as on RHEL RPMs
* Tue Feb 21 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.6.0.10-6 * Tue Feb 21 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.6.0.10-6
- Add docs, icons and samples to the portable output - Add docs, icons and samples to the portable output