Support building in el7 with devtoolset-7
This commit is contained in:
parent
c8edd47611
commit
08c8c778c9
@ -38,15 +38,29 @@ Patch20: uefi-fixes.patch
|
|||||||
|
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: dtc
|
BuildRequires: dtc
|
||||||
BuildRequires: gcc make
|
BuildRequires: make
|
||||||
|
# Added for .el7 rebuild, so newer gcc is used
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
BuildRequires: devtoolset-7-build
|
||||||
|
BuildRequires: devtoolset-7-binutils
|
||||||
|
BuildRequires: devtoolset-7-gcc
|
||||||
|
%else
|
||||||
|
BuildRequires: gcc
|
||||||
|
%endif
|
||||||
BuildRequires: flex bison
|
BuildRequires: flex bison
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
%if 0%{?fedora}
|
||||||
BuildRequires: python-unversioned-command
|
BuildRequires: python-unversioned-command
|
||||||
|
%endif
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
BuildRequires: python2-setuptools
|
BuildRequires: python2-setuptools
|
||||||
BuildRequires: python2-libfdt
|
BuildRequires: python2-libfdt
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
BuildRequires: python-pyelftools
|
||||||
|
%else
|
||||||
BuildRequires: python2-pyelftools
|
BuildRequires: python2-pyelftools
|
||||||
|
%endif
|
||||||
BuildRequires: SDL-devel
|
BuildRequires: SDL-devel
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
%ifarch %{arm} aarch64
|
%ifarch %{arm} aarch64
|
||||||
@ -113,6 +127,11 @@ cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
|
|||||||
%build
|
%build
|
||||||
mkdir builds
|
mkdir builds
|
||||||
|
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
#Enabling DTS for .el7
|
||||||
|
%{?enable_devtoolset7:%{enable_devtoolset7}}
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifarch aarch64 %{arm}
|
%ifarch aarch64 %{arm}
|
||||||
for board in $(cat %{_arch}-boards)
|
for board in $(cat %{_arch}-boards)
|
||||||
do
|
do
|
||||||
@ -302,6 +321,10 @@ cp -p board/warp7/README builds/docs/README.warp7
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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>
|
* Sun Sep 23 2018 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
- Update Rock960 patches, enable Rock960 Enterprise Edition (ficus)
|
- Update Rock960 patches, enable Rock960 Enterprise Edition (ficus)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user