From bc90ba687ed9f3e0f6b3948f90ce0682ccef4bd3 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Tue, 12 Jun 2018 10:56:39 +0200
Subject: [PATCH] Fix builds on s390x and aarch64.

- s390x doesn't build the SA.
- aarch64: disable slowdebug build.
---
 java-openjdk.spec | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/java-openjdk.spec b/java-openjdk.spec
index b6b2c69..17da270 100644
--- a/java-openjdk.spec
+++ b/java-openjdk.spec
@@ -31,7 +31,9 @@
 
 # By default, we build a debug build during main build on JIT architectures
 %ifarch %{jit_arches}
-%ifnarch %{arm}
+# Temporarily disable slowdebug build for Aarch64 since it does not
+# bootcycle. See JDK-8204331.
+%ifnarch %{arm} %{aarch64}
 %global include_debug_build 1
 %else
 %global include_debug_build 0
@@ -498,7 +500,12 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/librmi.so
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so
+%endif
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsunec.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
@@ -574,7 +581,12 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jimage
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb
+%endif
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jlink
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jmap
@@ -792,7 +804,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -1689,6 +1701,10 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Tue Jun 12 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.16-2
+- Disable Aarch64 slowdebug build (see JDK-8204331).
+- s390x doesn't have the SA even though it's a JIT arch.
+
 * Mon Jun 11 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.16-1
 - Initial version of JDK 11 ea based on tag jdk-11+16.
 - Removed patches no longer needed or upstream: