Permalink
Browse files

php 7.1.1-2: EL-7 rebuild with dts (again)

  • Loading branch information...
remicollet committed Jan 18, 2017
1 parent 62c98a6 commit b1a4c842942e6d2856aa95b6fd0427467073b984
Showing with 72 additions and 11 deletions.
  1. +25 −0 php/php71/php-intl.patch
  2. +7 −1 php/php71/php71.spec
  3. +25 −0 scl-php71/php/php-intl.patch
  4. +7 −1 scl-php71/php/php.spec
  5. +4 −4 tools/mock/el7x71.cfg
  6. +4 −5 tools/mock/el7xscl71.cfg
View
@@ -0,0 +1,25 @@
+From 6af22d0d3ed224d89be1d1e9e53ff7e2e2e5439d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Wed, 18 Jan 2017 13:00:49 +0100
+Subject: [PATCH] Fix #73956 Link use CC instead of CXX
+
+---
+ ext/intl/config.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
+index dd28276..ca2cd82 100644
+--- a/ext/intl/config.m4
++++ b/ext/intl/config.m4
+@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then
+ breakiterator/codepointiterator_methods.cpp \
+ uchar/uchar.c \
+ idn/idn.c \
+- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
++ $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx)
+ PHP_ADD_BUILD_DIR($ext_builddir/collator)
+ PHP_ADD_BUILD_DIR($ext_builddir/converter)
+ PHP_ADD_BUILD_DIR($ext_builddir/common)
+--
+2.1.4
+
View
@@ -121,7 +121,7 @@
%endif
#global rcver RC1
-%global rpmrel 2
+%global rpmrel 3
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -177,6 +177,7 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-intl.patch
# Security fixes (200+)
@@ -1026,6 +1027,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .73956
# security patches
@@ -2051,6 +2053,10 @@ fi
%changelog
+* Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-3
+- EL-7: add patch for https://bugs.php.net/73956
+- switch back to gcc 6.2
+
* Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-2
- EL-7: rebuild using gcc 4.8 instead of 6.2
because of https://bugzilla.redhat.com/1414348
@@ -0,0 +1,25 @@
+From 6af22d0d3ed224d89be1d1e9e53ff7e2e2e5439d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Wed, 18 Jan 2017 13:00:49 +0100
+Subject: [PATCH] Fix #73956 Link use CC instead of CXX
+
+---
+ ext/intl/config.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
+index dd28276..ca2cd82 100644
+--- a/ext/intl/config.m4
++++ b/ext/intl/config.m4
+@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then
+ breakiterator/codepointiterator_methods.cpp \
+ uchar/uchar.c \
+ idn/idn.c \
+- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
++ $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx)
+ PHP_ADD_BUILD_DIR($ext_builddir/collator)
+ PHP_ADD_BUILD_DIR($ext_builddir/converter)
+ PHP_ADD_BUILD_DIR($ext_builddir/common)
+--
+2.1.4
+
View
@@ -125,7 +125,7 @@
%endif
#global rcver RC1
-%global rpmrel 2
+%global rpmrel 3
Summary: PHP scripting language for creating dynamic web sites
@@ -183,6 +183,7 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-intl.patch
# Security fixes (200+)
@@ -894,6 +895,7 @@ support for JavaScript Object Notation (JSON) to PHP.
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .73956
# security patches
@@ -1808,6 +1810,10 @@ fi
%changelog
+* Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-3
+- EL-7: add patch for https://bugs.php.net/73956
+- switch back to gcc 6.2
+
* Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-2
- EL-7: rebuild using gcc 4.8 instead of 6.2
because of https://bugzilla.redhat.com/1414348
View
@@ -1,6 +1,6 @@
config_opts['root'] = 'el7x'
config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain'
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
@@ -25,9 +25,9 @@ config_opts['macros']['%rhel']="7"
config_opts['macros']['%_with_ibase']="1"
config_opts['macros']['%_with_oci8']="1"
config_opts['macros']['%runselftest']="1"
-#config_opts['macros']['%dtsversion']="6"
-#config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-#config_opts['macros']['%dtsprefix']="devtoolset-6-"
+config_opts['macros']['%dtsversion']="6"
+config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
+config_opts['macros']['%dtsprefix']="devtoolset-6-"
config_opts['yum.conf'] = """
[main]
View
@@ -1,7 +1,6 @@
config_opts['root'] = 'scl71el7x'
config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain'
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
config_opts['plugin_conf']['ccache_enable'] = True
@@ -28,9 +27,9 @@ config_opts['macros']['%_with_ibase']="1"
config_opts['macros']['%_with_oci8']="1"
config_opts['macros']['%runselftest']="1"
config_opts['macros']['%nophptag']="1"
-#config_opts['macros']['%dtsversion']="6"
-#config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-#config_opts['macros']['%dtsprefix']="devtoolset-6-"
+config_opts['macros']['%dtsversion']="6"
+config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
+config_opts['macros']['%dtsprefix']="devtoolset-6-"
config_opts['yum.conf'] = """
[main]

0 comments on commit b1a4c84

Please sign in to comment.