rpms/cjdns
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable devtoolset as cjdns now requires gcc >= 4.9

Browse Source
This commit is contained in:
Stuart D. Gathman 2020-07-02 22:11:39 -04:00
parent f2a1d3d73f
commit 1979fcc924
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cjdns.spec
View File

@ -169,13 +169,14 @@ BuildRequires: python34
%else %else
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: python36 BuildRequires: python36
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
%else %else
BuildRequires: python3 BuildRequires: python3
%endif %endif
%endif %endif
# Automated package review hates explicit BR on make, but it *is* needed # Automated package review hates explicit BR on make, but it *is* needed
BuildRequires: make gcc BuildRequires: make
%if !0%{use_embedded} %if !0%{use_embedded}
# x86_64 and ARM libnacl are not compiled with -fPIC before Fedora release 11. # x86_64 and ARM libnacl are not compiled with -fPIC before Fedora release 11.
@ -434,6 +435,10 @@ ln -s /usr/share/selinux/devel/Makefile .
make make
cd - cd -
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
%endif
%if 0 && %{with python3} %if 0 && %{with python3}
cd python-cjdns cd python-cjdns
python3 setup.py build python3 setup.py build
@ -458,9 +463,6 @@ NO_TEST=1 CJDNS_RELEASE_VERSION="%{name}-%{version}-%{release}" ./do
build_linux/test_testcjdroute_c all >test.out build_linux/test_testcjdroute_c all >test.out
%install %install
%if 0%{?rhel} == 5
rm -rf %{buildroot} # needed on RHEL5
%endif
# the main switch process # the main switch process
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}