From 40ffeb0eb5040f43ec3253fbe4aceafc9b8858dc Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Apr 17 2019 16:48:16 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index f886f32..05953f9 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -963,6 +963,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 @@ -1266,6 +1273,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} @@ -1760,6 +1771,9 @@ require "copy_jdk_configs.lua" %changelog +* Wed Apr 17 2019 Johnny Hughes - 1:11.0.3.7-0 +- Mnaual CentOS debranding + * Mon Apr 08 2019 Andrew Hughes - 1:11.0.3.7-0 - Add -mstackrealign workaround to build flags to avoid SSE issues on x86 - Resolves: rhbz#1693468