From 466954908b7fef03a388868aca4781b674a31333 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 19 2018 15:56:32 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index 5013ba4..81c543c 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -964,6 +964,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 @@ -1272,6 +1279,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} @@ -1759,6 +1770,9 @@ require "copy_jdk_configs.lua" %changelog +* Mon Nov 19 2018 Johnny Hughes +- Manual CentOS Debranding + * Wed Oct 24 2018 Severin Gehwolf - 1:11.0.1.13-3 - Bump release for rebuild.