archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Properly check for required icu4c libraries
This commit is contained in:
Christoph M. Becker 2024-12-07 15:11:58 +01:00
commit d18b7220a1
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/intl/config.w32
View file

@ -3,7 +3,10 @@
ARG_ENABLE("intl", "Enable internationalization support", "no"); ARG_ENABLE("intl", "Enable internationalization support", "no");
if (PHP_INTL != "no") { if (PHP_INTL != "no") {
if (CHECK_LIB("icuuc.lib", "intl", PHP_INTL) && if (CHECK_LIB("icudt.lib", "intl", PHP_INTL) &&
CHECK_LIB("icuin.lib", "intl", PHP_INTL) &&
CHECK_LIB("icuio.lib", "intl", PHP_INTL) &&
CHECK_LIB("icuuc.lib", "intl", PHP_INTL) &&
CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_INTL")) { CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_INTL")) {
// always build as shared - zend_strtod.c/ICU type conflict // always build as shared - zend_strtod.c/ICU type conflict
EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", true, EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", true,
@ -116,16 +119,9 @@ if (PHP_INTL != "no") {
codepointiterator_methods.cpp ", codepointiterator_methods.cpp ",
"intl"); "intl");
ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib");
/* Compat for ICU before 58.1.*/ /* Compat for ICU before 58.1.*/
if (CHECK_LIB("icule.lib", "intl", PHP_INTL)) { CHECK_LIB("icule.lib", "intl", PHP_INTL);
ADD_FLAG("LIBS_INTL", "icule.lib"); CHECK_LIB("iculx.lib", "intl", PHP_INTL);
}
if (CHECK_LIB("iculx.lib", "intl", PHP_INTL)) {
ADD_FLAG("LIBS_INTL", "iculx.lib");
}
ADD_FLAG("CFLAGS_INTL", "/std:c++17 /EHsc /DUNISTR_FROM_CHAR_EXPLICIT=explicit /DUNISTR_FROM_STRING_EXPLICIT=explicit /DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 /DU_HIDE_OBSOLETE_UTF_OLD_H=1"); ADD_FLAG("CFLAGS_INTL", "/std:c++17 /EHsc /DUNISTR_FROM_CHAR_EXPLICIT=explicit /DUNISTR_FROM_STRING_EXPLICIT=explicit /DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 /DU_HIDE_OBSOLETE_UTF_OLD_H=1");
} else { } else {
WARNING("intl not enabled; libraries and/or headers not found"); WARNING("intl not enabled; libraries and/or headers not found");