From 1979fcc92483203d2dc7379e1782890999312fd3 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Thu, 2 Jul 2020 22:11:39 -0400 Subject: [PATCH] Enable devtoolset as cjdns now requires gcc >= 4.9 --- cjdns.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cjdns.spec b/cjdns.spec index 84600aa..44f2b26 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -169,13 +169,14 @@ BuildRequires: python34 %else %if 0%{?rhel} == 7 BuildRequires: python36 +BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel %else BuildRequires: python3 %endif %endif # Automated package review hates explicit BR on make, but it *is* needed -BuildRequires: make gcc +BuildRequires: make %if !0%{use_embedded} # 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 cd - +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-7/enable +%endif + %if 0 && %{with python3} cd python-cjdns 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 %install -%if 0%{?rhel} == 5 - rm -rf %{buildroot} # needed on RHEL5 -%endif # the main switch process mkdir -p %{buildroot}%{_sbindir}