From b9f8f02d98d5f7d825f2f40eb55349572bac3952 Mon Sep 17 00:00:00 2001 From: Marc Henderkes Date: Tue, 16 Sep 2025 10:19:58 +0200 Subject: [PATCH] don't use libicu backend for libxml2 (it's discouraged from being used, the first path always goes through iconv, icu is only the fallback) --- config/lib.json | 2 +- src/SPC/builder/unix/library/libxml2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/lib.json b/config/lib.json index bda0baad..a2669483 100644 --- a/config/lib.json +++ b/config/lib.json @@ -450,6 +450,7 @@ }, "libmemcached": { "source": "libmemcached", + "cpp-library": true, "static-libs-unix": [ "libmemcached.a", "libmemcachedprotocol.a", @@ -594,7 +595,6 @@ ], "lib-suggests-unix": [ "xz", - "icu", "zlib" ], "lib-depends-windows": [ diff --git a/src/SPC/builder/unix/library/libxml2.php b/src/SPC/builder/unix/library/libxml2.php index 87fbab10..1e6e0f64 100644 --- a/src/SPC/builder/unix/library/libxml2.php +++ b/src/SPC/builder/unix/library/libxml2.php @@ -20,10 +20,10 @@ trait libxml2 "-DZLIB_INCLUDE_DIR={$this->getIncludeDir()}", '-DLIBXML2_WITH_ZLIB=OFF', ) - ->optionalLib('icu', ...cmake_boolean_args('LIBXML2_WITH_ICU')) ->optionalLib('xz', ...cmake_boolean_args('LIBXML2_WITH_LZMA')) ->addConfigureArgs( '-DLIBXML2_WITH_ICONV=ON', + '-DLIBXML2_WITH_ICU=OFF', // optional, but discouraged: https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/README.md '-DLIBXML2_WITH_PYTHON=OFF', '-DLIBXML2_WITH_PROGRAMS=OFF', '-DLIBXML2_WITH_TESTS=OFF',