[SCM] PostGIS branch master updated. 3.6.0rc2-653-g633a4c566

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  633a4c5663021efbd2ad8fa11f6a0e93ccda226d (commit)
      from  65f051b339926d22ecfa5c2032d658178bb2a3e3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 633a4c5663021efbd2ad8fa11f6a0e93ccda226d
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Sun Jun 21 03:03:40 2026 +0400

    Use xml2-config for fuzzer libxml links
    
    Prefer xml2-config for libxml2 linker flags in the standalone fuzzer smoke build while still allowing pkg-config as a fallback. This lets Windows buildbot environments with a private libxml2 installation provide the required library directory for geojson_import_fuzzer.
    
    Closes #6084
    
    Closes https://github.com/postgis/postgis/pull/1080

diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index ebe7077e2..675e6176f 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -32,8 +32,10 @@ check:
 	set -- $${cxx}; \
 	if [ "$$#" -eq 0 ] || ! command -v "$$1" >/dev/null 2>&1 || ! "$$@" --version >/dev/null 2>&1; then \
 		echo "C++ compiler '$${cxx}' not available; skipping fuzzer smoke check."; \
-	elif ! command -v pkg-config >/dev/null 2>&1 || ! pkg-config --exists json-c proj libxml-2.0; then \
+	elif ! command -v pkg-config >/dev/null 2>&1 || ! pkg-config --exists json-c proj; then \
 		echo "pkg-config metadata for fuzzer dependencies not found; skipping fuzzer smoke check."; \
+	elif ! command -v xml2-config >/dev/null 2>&1 && ! pkg-config --exists libxml-2.0; then \
+		echo "libxml2 fuzzer dependency helper not found; skipping fuzzer smoke check."; \
 	elif ! command -v geos-config >/dev/null 2>&1 || ! command -v gdal-config >/dev/null 2>&1; then \
 		echo "GEOS/GDAL fuzzer dependency helpers not found; skipping fuzzer smoke check."; \
 	else \
diff --git a/fuzzers/build_google_oss_fuzzers.sh b/fuzzers/build_google_oss_fuzzers.sh
index b4161bd69..30a39a4c7 100755
--- a/fuzzers/build_google_oss_fuzzers.sh
+++ b/fuzzers/build_google_oss_fuzzers.sh
@@ -27,10 +27,15 @@ POSTGIS_BUILD_DIR="${POSTGIS_BUILD_DIR:-$POSTGIS_SOURCE_DIR}"
 FUZZERS_DIR="$POSTGIS_SOURCE_DIR/fuzzers"
 JSON_C_LIBS=$(pkg-config --libs json-c)
 GEOS_LIBS=$(geos-config --clibs)
-PROJ_XML2_LIBS=$(pkg-config --libs proj libxml-2.0)
+PROJ_LIBS=$(pkg-config --libs proj)
+if command -v xml2-config >/dev/null 2>&1; then
+    XML2_LIBS=$(xml2-config --libs)
+else
+    XML2_LIBS=$(pkg-config --libs libxml-2.0)
+fi
 GDAL_CFLAGS=$(gdal-config --cflags)
 GDAL_LIBS=$(gdal-config --libs)
-POSTGIS_FUZZER_LIBS="$JSON_C_LIBS $GEOS_LIBS $PROJ_XML2_LIBS"
+POSTGIS_FUZZER_LIBS="$JSON_C_LIBS $GEOS_LIBS $PROJ_LIBS $XML2_LIBS"
 POSTGIS_PACKAGE_RUNTIME_LIBS="${POSTGIS_PACKAGE_RUNTIME_LIBS:-1}"
 
 target_local_cflags()

-----------------------------------------------------------------------

Summary of changes:
 fuzzers/Makefile                    | 4 +++-
 fuzzers/build_google_oss_fuzzers.sh | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS