Merge remote-tracking branch 'origin/candidate-9.6.x'

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · May 20, 2024 · 57b4dc8 · 57b4dc8
2 parents b7a7073 + 4040cbe
commit 57b4dc8
Show file tree

Hide file tree

Showing 27 changed files with 1 addition and 1,328 deletions.
diff --git a/vcpkg b/vcpkg
diff --git a/vcpkg_overlays/libmysql/cross-build.patch b/vcpkg_overlays/libmysql/cross-build.patch
diff --git a/vcpkg_overlays/libmysql/dependencies.patch b/vcpkg_overlays/libmysql/dependencies.patch
diff --git a/vcpkg_overlays/libmysql/fix_dup_symbols.patch b/vcpkg_overlays/libmysql/fix_dup_symbols.patch
+6 −6		dockerfiles/amazonlinux.dockerfile
+6 −6		dockerfiles/centos-7.dockerfile
+2 −2		dockerfiles/centos-8.dockerfile
+3 −2		dockerfiles/rockylinux-8.dockerfile
+162 −0		overlays/libmysql/cross-build.patch
+140 −0		overlays/libmysql/dependencies.patch
+20 −0		overlays/libmysql/fix_dup_symbols.patch
+121 −0		overlays/libmysql/install-exports.patch
+6 −0		overlays/libmysql/libmysql-config.cmake
+160 −0		overlays/libmysql/portfile.cmake
+4 −0		overlays/libmysql/usage
+47 −0		overlays/libmysql/vcpkg.json
+20 −0		overlays/libxml2/disable-docs.patch
+108 −0		overlays/libxml2/fix_cmakelist.patch
+90 −0		overlays/libxml2/portfile.cmake
+4 −0		overlays/libxml2/usage
+3 −0		overlays/libxml2/vcpkg-cmake-wrapper.cmake
+57 −0		overlays/libxml2/vcpkg.json
+45 −0		overlays/libxslt/fix-gcrypt-deps.patch
+14 −0		overlays/libxslt/libexslt-pkgconfig.patch
+22 −0		overlays/libxslt/msvc-no-suffix.patch
+83 −0		overlays/libxslt/portfile.cmake
+16 −0		overlays/libxslt/python3.patch
+17 −0		overlays/libxslt/skip-install-docs.patch
+12 −0		overlays/libxslt/usage
+5 −0		overlays/libxslt/vcpkg-cmake-wrapper.cmake
+43 −0		overlays/libxslt/vcpkg.json
+1 −1		overlays/nlp-engine/portfile.cmake
+1 −1		overlays/nlp-engine/vcpkg.json