archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve check for broken iconv //IGNORE (#13898)

Browse source 
Previous check defined the symbol ICONV_BROKEN_IGNORE to 0 or 1 and the
`#ifdef` macro condition in iconv.c file was always using a bypass. Even
when the //IGNORE is supported (for example, on GNU Libiconv).

With this change, the ICONV_BROKEN_IGNORE symbol is only defined if the
//IGNORE Autoconf check fails or when cross-compiling without setting
the php_cv_iconv_ignore variable.

This also enables overriding the ext/iconv //IGNORE check when
cross-compiling, by setting the php_cv_iconv_ignore variable to "yes" in
case the iconv library is known to have a working //IGNORE (for example,
GNU libiconv).

These cache variables can be set at configure step, when cross-compiling

    ./configure php_cv_iconv_ignore=yes
This commit is contained in:
Peter Kokot 2024-04-10 22:16:15 +02:00 • committed by GitHub
parent 99cfedfcf6
commit 4d28e40804
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/iconv/config.m4
View file

@ -112,8 +112,8 @@ int main(void) {
AC_MSG_RESULT(yes, cross-compiling) AC_MSG_RESULT(yes, cross-compiling)
]) ])
AC_MSG_CHECKING([if iconv supports //IGNORE]) AC_CACHE_CHECK([if iconv supports //IGNORE], [php_cv_iconv_ignore],
AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <iconv.h> #include <iconv.h>
#include <stdlib.h> #include <stdlib.h>
@ -132,16 +132,13 @@ int main(void) {
} }
return 0; return 0;
} }
]])],[ ]])],
AC_MSG_RESULT(yes) [php_cv_iconv_ignore=yes],
AC_DEFINE([ICONV_BROKEN_IGNORE],0,[Whether iconv supports IGNORE]) [php_cv_iconv_ignore=no],
],[ [php_cv_iconv_ignore=no])])
AC_MSG_RESULT(no)
AC_DEFINE([ICONV_BROKEN_IGNORE],1,[Whether iconv supports IGNORE]) AS_VAR_IF([php_cv_iconv_ignore], [no],
],[ [AC_DEFINE([ICONV_BROKEN_IGNORE], [1], [Whether iconv has broken IGNORE.])])
AC_MSG_RESULT(no, cross-compiling)
AC_DEFINE([ICONV_BROKEN_IGNORE],0,[Whether iconv supports IGNORE])
])
LDFLAGS="$save_LDFLAGS" LDFLAGS="$save_LDFLAGS"
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"