Fridrich Strba 2021-07-28 11:11:18 +00:00 committed by Git OBS Bridge
parent d1c9d7b08e
commit 8cd01a0132

View File

@ -135,11 +135,6 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
%if 0%{?suse_version} > 1500 && !0%{?sle_version}
%global with_shanandoah 1
%else
%global with_shenandoah 0
%endif
%bcond_without bootstrap
%bcond_with zero
# Turn on/off some features depending on openSUSE version
@ -152,6 +147,11 @@
%else
%global with_systemtap 0
%endif
%if 0%{?suse_version} > 1500 && !0%{?sle_version}
%global with_shenandoah 1
%else
%global with_shenandoah 0
%endif
%if %{with_systemtap}
# Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir,
@ -523,7 +523,7 @@ sh autogen.sh
%endif
--with-nashorn-src-zip=%{SOURCE11}
%make_build patch
make patch %{?_smp_mflags}
patch -p0 -i %{PATCH2}
patch -p0 -i %{PATCH3}
@ -547,7 +547,7 @@ patch -p0 -i %{PATCH3000}
bash ./autogen.sh
)
%make_build
make %{?_smp_mflags}
export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
@ -574,7 +574,7 @@ pushd icedtea-sound-%{icedtea_sound_version}
%configure \
--with-jdk-home=$JAVA_HOME \
--disable-docs
%make_build
make %{?_smp_mflags}
cp icedtea-sound.jar $JAVA_HOME/jre/lib/ext/
cp build/native/libicedtea-sound.so $JAVA_HOME/jre/lib/%{archinstall}/
echo "#Config file to enable PulseAudio support" > $JAVA_HOME/jre/lib/pulseaudio.properties