From a738f8caa3253490af4d62ac5e2bfff92c2d1062 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Oct 01 2020 15:54:24 +0000 Subject: build on armhfp --- diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec index 7717f95..3790683 100644 --- a/SPECS/java-1.8.0-openjdk.spec +++ b/SPECS/java-1.8.0-openjdk.spec @@ -1089,6 +1089,14 @@ 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 @@ -1454,6 +1462,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} @@ -1477,6 +1489,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 EXTRA_ASFLAGS="${EXTRA_CFLAGS}" export EXTRA_CFLAGS EXTRA_ASFLAGS