From b1ee24d91408b0b710eac31b9ac52cd4a6f8bf5d193207a41c6557f381583598 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 26 Nov 2019 10:53:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=15

---
 scala.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scala.spec b/scala.spec
index d6fde25..12e37f8 100644
--- a/scala.spec
+++ b/scala.spec
@@ -22,6 +22,9 @@
 %else
 %bcond_with bootstrap
 %endif
+%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
+# Sync the list of jit architectures with java-1_8_0-openjdk package
+%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm}
 %global fullversion %{version}
 %global release_repository http://nexus.scala-tools.org/content/repositories/releases
 %global snapshot_repository http://nexus.scala-tools.org/content/repositories/snapshots
@@ -93,6 +96,7 @@ Name:           %{base_name}-bootstrap
 %else
 Name:           %{base_name}
 BuildRequires:  %{base_name}-bootstrap
+Provides:       %{base_name}-bootstrap
 Obsoletes:      %{base_name}-bootstrap
 %endif
 
@@ -167,7 +171,7 @@ sed -i '/is not supported by/d' build.xml
 sed -i '/exec.*pull-binary-libs.sh/d' build.xml
 
 %if %{with bootstrap}
-%global do_bootstrap -DdoBootstrapBuild=yes -Dlocker.skip=1 -Dscalac.args=-verbose
+%global do_bootstrap -DdoBootstrapBuild=yes
 %global docs_target %{nil}
 tar -xzvf %{SOURCE2}
 %if %{want_jdk8}
@@ -207,7 +211,14 @@ chmod 755 tools/get-scala-*
 
 export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
 
-%ant build %{docs_target} || exit 1
+# Add the -verbose flag to scalac on zero architectures. The build
+# is slow, OBS thinks it is stuck and kills it before it has chance
+# to finish
+%ant \
+%ifnarch %{jit_arches}
+	-Dscalac.args=-verbose \
+%endif
+	build %{docs_target} || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no
 bnd wrap --properties %{SOURCE1} --output scala-library.jar \