File tree Expand file tree Collapse file tree 2 files changed +10
-7
lines changed Expand file tree Collapse file tree 2 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -84,10 +84,10 @@ set(HAVE_GD_XPM_EXITCODE 1)
8484################################################################################
8585
8686# Set the exit code of the iconv //IGNORE check.
87- set (ICONV_BROKEN_IGNORE_EXITCODE 1 )
87+ set (PHP_EXT_ICONV_HAS_BROKEN_IGNORE_EXITCODE 0 )
8888
8989# Set the exit code of the iconv errno check.
90- set (PHP_ICONV_ERRNO_WORKS_EXITCODE 0)
90+ set (PHP_EXT_ICONV_HAS_ERRNO_EXITCODE 0)
9191
9292################################################################################
9393# ext/opcache
Original file line number Diff line number Diff line change @@ -216,16 +216,18 @@ if(TARGET Iconv::Iconv)
216216 iconv_close(cd);
217217 return 2;
218218 }
219- ]] PHP_ICONV_ERRNO_WORKS )
219+ ]] PHP_EXT_ICONV_HAS_ERRNO )
220220 cmake_pop_check_state()
221- if (PHP_ICONV_ERRNO_WORKS )
221+ if (PHP_EXT_ICONV_HAS_ERRNO )
222222 message (CHECK_PASS "yes" )
223223 else ()
224224 message (CHECK_PASS "no" )
225225 message (FATAL_ERROR "The iconv 'errno' sanity check failed." )
226226 endif ()
227227
228- message (CHECK_START "Checking if iconv supports //IGNORE" )
228+ # https://sourceware.org/bugzilla/show_bug.cgi?id=13541
229+ # https://bugs.php.net/48147
230+ message (CHECK_START "Checking if iconv has usable //IGNORE" )
229231 cmake_push_check_state(RESET)
230232 set (CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
231233 set (CMAKE_REQUIRED_QUIET TRUE )
@@ -256,9 +258,10 @@ if(TARGET Iconv::Iconv)
256258 }
257259 return 1;
258260 }
259- ]] ICONV_BROKEN_IGNORE )
261+ ]] PHP_EXT_ICONV_HAS_BROKEN_IGNORE )
260262 cmake_pop_check_state()
261- if (ICONV_BROKEN_IGNORE)
263+ if (PHP_EXT_ICONV_HAS_BROKEN_IGNORE)
264+ set (ICONV_BROKEN_IGNORE TRUE )
262265 message (CHECK_FAIL "no" )
263266 else ()
264267 message (CHECK_PASS "yes" )
You can’t perform that action at this time.
0 commit comments