From 4c429c4bd3e4915813b681dfcf5a060e88694f96 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 4 Sep 2018 23:17:14 -0400
Subject: test palemoon with devtoolset-7-toolchain

---
 palemoon/palemoon.spec | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'palemoon/palemoon.spec')

diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index df52b72..1a7f1f8 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -24,7 +24,9 @@ BuildRequires:	dbus-glib-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gcc
 %if 0%{?el7}
-BuildRequires:	gcc49
+#BuildRequires:	gcc49
+# already includes the sclo and scl-rh repos?
+BuildRequires: devtoolset-7-toolchain
 %endif
 BuildRequires:	gcc-c++
 BuildRequires:	gtk2-devel
@@ -61,18 +63,32 @@ and themes to make the browser truly your own.
 
 %build
 %if 0%{?el7}
-source /usr/bin/gcc49
-%endif
-%if !%{dummy_package}
-./mach build
+   #source /usr/bin/gcc49
+   %if !%{dummy_package}
+      thispwd=$( pwd )
+      sci enable devtoolset-7 /bin/bash << EOF
+         pushd $thispwd
+         ./mach build
+         popd
+EOF
+   %endif
+%else
+   %if !%{dummy_package}
+   ./mach build
+   %endif
 %endif
 
 %install
-%if 0%{?el7}
-source /usr/bin/gcc49
-%endif
+#%if 0%{?el7}
+#source /usr/bin/gcc49
+#%endif
 rm -rf %{buildroot}
 
+%if 0%{?el7}
+thispwd=$( pwd )
+scl enable devtoolset-7 /bin/bash << EOF
+pushd $thispwd
+%endif
 %if !%{dummy_package}
 make -f client.mk \
    DESTDIR=%{buildroot} \
@@ -82,6 +98,10 @@ make -f client.mk \
    sdkdir=%{_libdir}/%{name}-devel \
    install
 %endif
+%if 0%{?el7}
+EOF
+popd
+%endif
 
 # cleanup
 %{__rm} -rf  %{buildroot}%{_datadir}/idl/%{pkgname} \
-- 
cgit