Support building in el7 with devtoolset-7

This commit is contained in:
Pablo Greco 2018-10-01 21:19:31 -03:00
parent f5a780f2f5
commit ef7dbce952
1 changed files with 24 additions and 0 deletions

View File

@ -39,11 +39,17 @@ BuildRequires: gcc make
BuildRequires: flex bison
BuildRequires: git-core
BuildRequires: openssl-devel
%if 0%{?fedora}
BuildRequires: python-unversioned-command
%endif
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-libfdt
%if 0%{?rhel} == 7
BuildRequires: python-pyelftools
%else
BuildRequires: python2-pyelftools
%endif
BuildRequires: SDL-devel
BuildRequires: swig
%ifarch %{arm} aarch64
@ -53,6 +59,14 @@ BuildRequires: vboot-utils
BuildRequires: arm-trusted-firmware-armv8
%endif
# Added for .el7 rebuild, so newer gcc is needed
%if 0%{?rhel} == 7
BuildRequires: devtoolset-7-build
BuildRequires: devtoolset-7-binutils
BuildRequires: devtoolset-7-gcc
BuildRequires: devtoolset-7-gcc-c++
%endif
Requires: dtc
Requires: systemd
@ -110,6 +124,12 @@ cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
%build
mkdir builds
#Enabling DTS for .el7
%if 0%{?rhel} == 7
#Enabling DTS for .el7
%{?enable_devtoolset7:%{enable_devtoolset7}}
%endif
%ifarch aarch64 %{arm}
for board in $(cat %{_arch}-boards)
do
@ -299,6 +319,10 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif
%changelog
* Sun Sep 30 2018 Pablo Greco <pablo@fliagreco.com.ar>
- Added conditional to enable devtoolset-7-gcc for .el7 build (Arrfab)
- Added conditional BR, python2-pyelftools is python-pyelftools in .el7 (Arrfab)
* Sun Sep 23 2018 Peter Robinson <pbrobinson@fedoraproject.org>
- Update Rock960 patches, enable Rock960 Enterprise Edition (ficus)