summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2022-03-31 17:29:44 -0400
committerGitHub <noreply@github.com>2022-03-31 17:29:44 -0400
commitd7863d82ccb345a3d7d47917f6d88ca12078fab1 (patch)
treed308f3b17969aefa3e18a02ade8da29765e3bbc3
parent7e5e3fa217b9e1b4d61c72d8dbd7e4b88e879cee (diff)
parent9f972704946b311ab9de437c89979dd4c2659358 (diff)
downloadchef-d7863d82ccb345a3d7d47917f6d88ca12078fab1.tar.gz
Merge pull request #12752 from chef/jsnapp/IPACK-80-bump-libxml2-and-libxslt
Bump libxslt to 1.1.35
-rw-r--r--omnibus_overrides.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index f9cda5ea9f..e65b24c0c7 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -7,8 +7,13 @@ override "libffi", version: "3.4.2"
override "libiconv", version: "1.16"
override "liblzma", version: "5.2.5"
override "libtool", version: "2.4.2"
-override "libxml2", version: "2.9.13"
-override "libxslt", version: "1.1.34"
+
+# libxslt 1.1.35 does not build successfully with libxml2 2.9.13 on Windows so we will pin
+# windows builds to libxslt 1.1.34 and libxml2 2.9.10 for now and followup later with the
+# work to fix that issue in IPACK-145.
+override "libxml2", version: windows? ? "2.9.10" : "2.9.13"
+override "libxslt", version: windows? ? "1.1.34" : "1.1.35"
+
override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"