diff options
| -rw-r--r-- | palemoon/palemoon.spec | 36 |
1 files changed, 28 insertions, 8 deletions
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} \ |