summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-06-09 09:55:31 +0200
committerRemi Collet <remi@remirepo.net>2017-06-09 09:55:31 +0200
commit45c842d7b6a36ec5168c868a26b512ff07661ee9 (patch)
tree1facf6456bc82d922c175361165b294b8adf047c
parent7e0af6d69fbc915ce3760984fbc180fee51c7249 (diff)
use GCC 6.2 from devtoolset-6 on EL-7
-rw-r--r--php-pecl-mustache.spec20
1 files changed, 17 insertions, 3 deletions
diff --git a/php-pecl-mustache.spec b/php-pecl-mustache.spec
index 30aff1b..a6389b0 100644
--- a/php-pecl-mustache.spec
+++ b/php-pecl-mustache.spec
@@ -22,7 +22,7 @@
Summary: Mustache templating language
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: MIT
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -33,6 +33,11 @@ Patch0: %{pecl_name}-pr34.patch
BuildRequires: %{?scl_prefix}php-devel > 5.6
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: libmustache-devel
+%if 0%{?rhel} == 7
+BuildRequires: devtoolset-6-toolchain
+%else
+BuildRequires: gcc-c++
+%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
@@ -112,8 +117,10 @@ EOF
%build
-# can't use {?dtsenable}
-# https://github.com/jbboehr/php-mustache/issues/35
+%if 0%{?rhel} == 7
+source /opt/rh/devtoolset-6/enable
+g++ --version
+%endif
cd NTS
%{_bindir}/phpize
@@ -137,6 +144,10 @@ make %{?_smp_mflags}
%install
+%if 0%{?rhel} == 7
+source /opt/rh/devtoolset-6/enable
+%endif
+
make -C NTS install INSTALL_ROOT=%{buildroot}
# install config file
@@ -228,6 +239,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Fri Jun 9 2017 Remi Collet <remi@remirepo.net> - 0.8.2~RC1-2
+- use GCC 6.2 from devtoolset-6 on EL-7
+
* Thu Jun 8 2017 Remi Collet <remi@remirepo.net> - 0.8.2~RC1-1
- initial package