From 7418626b78472c3f1a1f36e42c18e2139e9f7479 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Oct 22 2019 16:04:05 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index b6cf1d6..1f92524 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -980,6 +980,13 @@ BuildRequires: freetype-devel BuildRequires: giflib-devel BuildRequires: gcc-c++ BuildRequires: gdb +%ifarch %{arm} +BuildRequires: devtoolset-7-build +BuildRequires: devtoolset-7-binutils +BuildRequires: devtoolset-7-gcc +BuildRequires: devtoolset-7-gcc-c++ +BuildRequires: devtoolset-7-gdb +%endif BuildRequires: gtk2-devel # LCMS on rhel7 is older then LCMS in intree JDK BuildRequires: lcms2-devel @@ -1283,6 +1290,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}