1
0
Fridrich Strba 2024-02-14 08:39:33 +00:00 committed by Git OBS Bridge
parent 95ba7a45f8
commit 8bf0aad0e4
2 changed files with 17 additions and 2 deletions

View File

@ -1,7 +1,8 @@
-------------------------------------------------------------------
Tue Feb 13 18:33:31 UTC 2024 - Fridrich Strba <fstrba@suse.com>
Tue Feb 13 17:20:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Build arm6 as JIT architecture
- Add a workaround to allow cmake to find JVM library on zero
architectures
-------------------------------------------------------------------
Wed Feb 7 13:59:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -59,6 +59,9 @@
%ifnarch %{jit_arches}
%global _with_zero 1
%endif
%ifarch %{arm6}
%global _with_zero 1
%endif
%if %{debug}
%global debugbuild slowdebug
%else
@ -647,6 +650,16 @@ find %{buildroot}%{_jvmdir}/%{sdkdir}/demo \
%fdupes -s %{buildroot}/%{_jvmdir}/%{sdkdir}/demo
%fdupes -s %{buildroot}%{_javadocdir}/%{sdklnk}
%if %{with zero}
pushd %{buildroot}%{_jvmdir}/%{sdkdir}/lib
if [ ! -d server ]; then
if [ -d zero ]; then
ln -s zero server
fi
fi
popd
%endif
%post headless
ext=.gz
update-alternatives \
@ -850,6 +863,7 @@ fi
%dir %{_jvmdir}/%{sdkdir}/lib/jfr
%if %{with zero}
%dir %{_jvmdir}/%{sdkdir}/lib/zero
%{_jvmdir}/%{sdkdir}/lib/server
%else
%dir %{_jvmdir}/%{sdkdir}/lib/server
%endif