mirror of
https://abf.rosa.ru/djam/java-17-openjdk.git
synced 2025-04-19 14:14:10 +00:00
build without libjsvml on rosa2021.15 (thanks to slava86)
This commit is contained in:
parent
65fb89da57
commit
b3011fee0f
1 changed files with 15 additions and 3 deletions
|
@ -29,6 +29,14 @@
|
|||
%bcond_with bootstrap
|
||||
%define _duplicate_files_terminate_build 0
|
||||
|
||||
# enable libjsvml on x86_64 if not rosa2021.15
|
||||
%global libjsvml 0
|
||||
%ifarch %{x86_64}
|
||||
%if %{mdvver} != 202115
|
||||
%global libjsvml 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Workaround for stripping of debug symbols from static libraries
|
||||
%if %{with staticlibs}
|
||||
%define __brp_strip_static_archive %{nil}
|
||||
|
@ -354,7 +362,7 @@
|
|||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 7
|
||||
%global rpmrelease 3
|
||||
%global rpmrelease 4
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
|
@ -882,7 +890,7 @@ exit 0
|
|||
%endif
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
|
||||
%ifarch %{svml_arches}
|
||||
%if %{libjsvml} == 1
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsyslookup.so
|
||||
|
@ -1858,7 +1866,11 @@ openjdk/src/hotspot/os_cpu/linux_sparc \
|
|||
openjdk/src/hotspot/os_cpu/solaris* \
|
||||
openjdk/src/hotspot/os_cpu/windows* \
|
||||
openjdk/src/jdk.incubator.vector/windows
|
||||
# TODO: openjdk/src/jdk.incubator.vector/linux/native/libjsvml, ~200K lines of asm code
|
||||
%if %{libjsvml} == 0
|
||||
# remove ~200000 lines of assembler code
|
||||
echo > openjdk/make/modules/jdk.incubator.vector/Lib.gmk
|
||||
rm -fvr openjdk/src/jdk.incubator.vector/linux/native/libjsvml
|
||||
%endif
|
||||
|
||||
%build
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue