Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
php 7.1.1-2: EL-7 rebuild with dts (again)
- Loading branch information
1 parent
62c98a6
commit b1a4c84
Showing
6 changed files
with
72 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters