-
Notifications
You must be signed in to change notification settings - Fork 1
/
intl-stdc++.patch
27 lines (23 loc) · 1010 Bytes
/
intl-stdc++.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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-8.4.1/build/php.m4~ 2024-11-22 10:01:25.000000000 +0100
+++ php-8.4.1/build/php.m4 2024-11-22 10:02:25.646654614 +0100
@@ -757,7 +757,6 @@ AC_DEFUN([PHP_REQUIRE_CXX], [
AS_VAR_IF([php_cxx_done],, [
AC_PROG_CXX
AC_PROG_CXXCPP
- PHP_ADD_LIBRARY([stdc++])
php_cxx_done=yes
])
])
--- php-8.4.1/ext/intl/config.m4~ 2024-11-20 10:48:35.000000000 +0100
+++ php-8.4.1/ext/intl/config.m4 2024-11-22 10:03:11.049987946 +0100
@@ -4,6 +4,7 @@ PHP_ARG_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])
INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"