Hello community,
here is the log from the commit of package bazel0.29 for openSUSE:Factory
checked in at 2019-12-04 13:53:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bazel0.29 (Old)
and /work/SRC/openSUSE:Factory/.bazel0.29.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bazel0.29"
Wed Dec 4 13:53:28 2019 rev:3 rq:753286 version:0.29.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/bazel0.29/bazel0.29.changes 2019-11-27
13:57:28.516245546 +0100
+++ /work/SRC/openSUSE:Factory/.bazel0.29.new.4691/bazel0.29.changes
2019-12-04 14:20:14.402431053 +0100
@@ -1,0 +2,13 @@
+Mon Dec 2 16:31:26 UTC 2019 - Klaus Kämpf <kkae...@suse.com>
+
+- Add patch which fixes build on s390x architecture:
+ * 0002-fix-build-for-s390x.patch
+
+- s390x: build with Java 11, adapt Java stack/heap
+
+-------------------------------------------------------------------
+Mon Dec 2 11:17:18 UTC 2019 - Klaus Kämpf <kkae...@suse.com>
+
+- add _constraints to fix build on s390x
+
+-------------------------------------------------------------------
New:
----
0002-fix-build-for-s390x.patch
_constraints
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bazel0.29.spec ++++++
--- /var/tmp/diff_new_pack.7O0h5w/_old 2019-12-04 14:20:18.474434485 +0100
+++ /var/tmp/diff_new_pack.7O0h5w/_new 2019-12-04 14:20:18.474434485 +0100
@@ -20,6 +20,17 @@
%define shortname bazel
%define shortver 0.29
+#Workaround for s390x (Java 1.8 runs out of memory)
+%ifarch s390x
+%if 0%{?suse_version} > 1500
+%define openjdktouse java-12-openjdk-devel
+%else
+%define openjdktouse java-11-openjdk-devel
+%endif
+%else
+%define openjdktouse java-1_8_0-openjdk-devel
+%endif
+
Name: bazel%{shortver}
Version: 0.29.1
Release: 0
@@ -29,7 +40,8 @@
URL: http://bazel.io/
Source0:
https://github.com/bazelbuild/bazel/releases/download/%{version}/%{shortname}-%{version}-dist.zip
Source1:
https://github.com/bazelbuild/bazel/releases/download/%{version}/%{shortname}-%{version}-dist.zip.sig
-Patch0: 0001-fix-build-for-Power.patch
+Patch1: 0001-fix-build-for-Power.patch
+Patch2: 0002-fix-build-for-s390x.patch
BuildRequires: gcc-c++
BuildRequires: java-1_8_0-openjdk-devel
BuildRequires: pkgconfig
@@ -40,7 +52,7 @@
BuildRequires: pkgconfig(zlib)
Requires(post): update-alternatives
Requires(postun): update-alternatives
-Requires: java-1_8_0-openjdk-devel
+Requires: %{openjdktouse}
Provides: bazel = %{version}
ExcludeArch: %ix86
@@ -51,7 +63,8 @@
%prep
%setup -q -c
-%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# Remove executable permissions
chmod 0644 AUTHORS CHANGELOG.md CONTRIBUTORS LICENSE
# Use Python 3
@@ -64,6 +77,9 @@
%ifarch aarch64 %arm
export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
%endif
+%ifarch s390x
+export BAZEL_JAVAC_OPTS="-J-Xmx4g -J-Xms1g"
+%endif
CC=gcc
CXX=g++
EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh
++++++ 0002-fix-build-for-s390x.patch ++++++
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
-x .deps -x .libs ../orig-bazel/src/conditions/BUILD ./src/conditions/BUILD
--- ../orig-bazel/src/conditions/BUILD 2019-12-02 17:29:24.692172896 +0100
+++ ./src/conditions/BUILD 2019-12-02 17:29:55.476790588 +0100
@@ -11,6 +11,12 @@
)
config_setting(
+ name = "linux_s390x",
+ values = {"cpu": "s390x"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
name = "linux_ppc",
values = {"cpu": "ppc"},
visibility = ["//visibility:public"],
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
-x .deps -x .libs ../orig-bazel/third_party/BUILD ./third_party/BUILD
--- ../orig-bazel/third_party/BUILD 2019-12-02 17:29:31.784315198 +0100
+++ ./third_party/BUILD 2019-12-02 17:30:15.361189561 +0100
@@ -527,6 +527,7 @@
"//src/conditions:arm": "*.so *.jnilib *.dll",
"//src/conditions:linux_aarch64": "*.so *.jnilib *.dll",
"//src/conditions:linux_ppc": "*.so *.jnilib *.dll",
+ "//src/conditions:linux_s390x": "*.so *.jnilib *.dll",
# Play it safe -- better have a big binary than a slow binary
# zip -d does require an argument. Supply something bogus.
"//conditions:default": "*.bogusextension",
++++++ _constraints ++++++
<constraints>
<hardware>
<physicalmemory>
<size unit="M">8000</size>
</physicalmemory>
</hardware>
</constraints>
