[packages/php] avoid linking php-common with stdc++
glen
glen at pld-linux.org
Mon May 16 18:30:09 CEST 2016
commit bf071fdd055b765197f4354d485cb1830437ee7f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon May 16 19:29:49 2016 +0300
avoid linking php-common with stdc++
intl-stdc++.patch | 26 ++++++++++++++++++++++++++
php.spec | 7 +++----
2 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index a91c159..6dbdf05 100644
--- a/php.spec
+++ b/php.spec
@@ -1,7 +1,6 @@
# TODO 5.6:
# - enable --with-fpm-systemd, but ensure it checks for sd_booted()
# - build with system libgd 2.1, see 73c5128
-# - ext/intl poison libs in php-common: https://github.com/pld-linux/php/commit/5b279587c5f1dec19027944644902d6e993d5446
# TODO 5.4:
# - update imap annotations patch (needs api porting)
# - update imap myrights patch (needs api porting)
@@ -145,7 +144,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 7.0.6
-Release: 2
+Release: 3
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -167,7 +166,7 @@ Patch0: %{orgname}-shared.patch
Patch1: %{orgname}-pldlogo.patch
Patch2: %{orgname}-mail.patch
Patch3: %{orgname}-link-libs.patch
-
+Patch4: intl-stdc++.patch
Patch5: %{orgname}-filter-shared.patch
Patch6: %{orgname}-build_modules.patch
Patch7: %{orgname}-sapi-ini-file.patch
@@ -1942,7 +1941,7 @@ cp -p php.ini-production php.ini
%patch1 -p1
#%patch2 -p1 NEEDS PORTING
%patch3 -p1
-
+%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
diff --git a/intl-stdc++.patch b/intl-stdc++.patch
new file mode 100644
index 0000000..f762c9b
--- /dev/null
+++ b/intl-stdc++.patch
@@ -0,0 +1,26 @@
+
+avoid adding -lstdc++ when linking php-common
+it's needed for ext/intl
+but it requires icu which already links with stdc++
+so just omit PHP_ADD_LIBRARY(stdc++)
+
+--- php-7.0.6/acinclude.m4~ 2016-05-16 18:31:11.000000000 +0300
++++ php-7.0.6/acinclude.m4 2016-05-16 18:50:34.614991634 +0300
+@@ -762,7 +762,6 @@
+ if test -z "$php_cxx_done"; then
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+- PHP_ADD_LIBRARY(stdc++)
+ php_cxx_done=yes
+ fi
+ ])
+--- php-7.0.6/ext/intl/config.m4~ 2016-04-28 21:13:06.000000000 +0300
++++ php-7.0.6/ext/intl/config.m4 2016-05-16 18:49:53.909531704 +0300
+@@ -6,6 +6,7 @@
+ [ --enable-intl Enable internationalization support])
+
+ if test "$PHP_INTL" != "no"; then
++ dnl -lstdc++ not needed, will be inherited from icu
+ PHP_SETUP_ICU(INTL_SHARED_LIBADD)
+ PHP_SUBST(INTL_SHARED_LIBADD)
+ PHP_REQUIRE_CXX()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/bf071fdd055b765197f4354d485cb1830437ee7f
More information about the pld-cvs-commit
mailing list