From 5f61d711c2b885968459853ae2ea2216dd70dca7 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Jul 23 2019 16:30:01 +0000
Subject: Manual CentOS Debranding


---

diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec
index b7c17c2..baa5731 100644
--- a/SPECS/java-1.8.0-openjdk.spec
+++ b/SPECS/java-1.8.0-openjdk.spec
@@ -1088,6 +1088,13 @@ BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zip
 BuildRequires: unzip
+%ifarch %{arm}
+BuildRequires: devtoolset-7-build
+BuildRequires: devtoolset-7-binutils
+BuildRequires: devtoolset-7-gcc
+BuildRequires: devtoolset-7-gcc-c++
+BuildRequires: devtoolset-7-gdb
+%endif 
 # Use OpenJDK 7 where available (on RHEL) to avoid
 # having to use the rhel-7.x-java-unsafe-candidate hack
 %if ! 0%{?fedora} && 0%{?rhel} <= 7
@@ -1451,6 +1458,10 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
 
 
 %build
+%ifarch %{arm}
+%{?enable_devtoolset7:%{enable_devtoolset7}}
+%endif 
+
 # How many CPU's do we have?
 export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
 export NUM_PROC=${NUM_PROC:-1}
@@ -1474,6 +1485,9 @@ EXTRA_CPP_FLAGS="%ourcppflags"
 # fix rpmlint warnings
 EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
 %endif
+%ifarch %{arm}
+EXTRA_CFLAGS="$EXTRA_CFLAGS -Wno-nonnull"
+%endif
 export EXTRA_CFLAGS
 
 (cd %{top_level_dir_name}/common/autoconf
@@ -2063,6 +2077,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Jul 23 2019 Johnny Hughes <johnny@centos.org>
+- Manual CentOS Debranding
+
 * Thu Jul 11 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b10-0
 - Update to aarch64-shenandoah-jdk8u222-b10.
 - Resolves: rhbz#1724452