Skip to content

Commit 0de8e40

Browse files
authored
Drop bogus ext/libxml dependency on ext/iconv (GH-16801)
There is no such dependency; only libxml2 depends on libiconv. So when php_libxml.dll is built, it needs to be linked against libiconv, or, when ext/iconv has been configured as static extension, against php8.dll.
1 parent 2c532cf commit 0de8e40

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ext/libxml/config.w32

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ ARG_WITH("libxml", "LibXML support", "yes");
44

55
if (PHP_LIBXML == "yes") {
66
if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
7-
CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") &&
7+
((PHP_ICONV != "no" && !PHP_ICONV_SHARED) || CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml")) &&
88
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML", PHP_PHP_BUILD + "\\include\\libxml2") &&
9-
CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_LIBXML", PHP_PHP_BUILD + "\\include\\libxml2") &&
10-
ADD_EXTENSION_DEP('libxml', 'iconv')) {
9+
CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_LIBXML", PHP_PHP_BUILD + "\\include\\libxml2")) {
1110

1211
if (GREP_HEADER("libxml/xmlversion.h", "#define\\s+LIBXML_VERSION\\s+(\\d+)", PHP_PHP_BUILD + "\\include\\libxml2") &&
1312
+RegExp.$1 >= 20904) {

0 commit comments

Comments
 (0)