]> TLD Linux GIT Repositories - packages/php.git/blob - intl-stdc++.patch
- sync patches with PLD
[packages/php.git] / intl-stdc++.patch
1
2 avoid adding -lstdc++ when linking php-common
3 it's needed for ext/intl
4 but it requires icu which already links with stdc++
5 so just omit PHP_ADD_LIBRARY(stdc++)
6
7 --- php-7.0.6/build/php.m4~     2016-05-16 18:31:11.000000000 +0300
8 +++ php-7.0.6/build/php.m4      2016-05-16 18:50:34.614991634 +0300
9 @@ -762,7 +762,6 @@
10    if test -z "$php_cxx_done"; then
11      AC_PROG_CXX
12      AC_PROG_CXXCPP
13 -    PHP_ADD_LIBRARY(stdc++)
14      php_cxx_done=yes
15    fi
16  ])
17 --- php-7.0.6/ext/intl/config.m4~       2016-04-28 21:13:06.000000000 +0300
18 +++ php-7.0.6/ext/intl/config.m4        2016-05-16 18:49:53.909531704 +0300
19 @@ -6,6 +6,7 @@
20  [  --enable-intl           Enable internationalization support])
21  
22  if test "$PHP_INTL" != "no"; then
23 +  dnl -lstdc++ not needed, will be inherited from icu
24    PHP_SETUP_ICU(INTL_SHARED_LIBADD)
25    PHP_SUBST(INTL_SHARED_LIBADD)
26    PHP_REQUIRE_CXX()