From ef47ec38e73712ee8398f2c22dd0795ea8ef579e Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Fri, 17 Dec 2021 23:47:47 +0300
Subject: [PATCH] [macOS] install zlib (#4763)

---
 images/macos/software-report/SoftwareReport.Common.psm1   | 5 +++++
 images/macos/software-report/SoftwareReport.Generator.ps1 | 3 +++
 images/macos/toolsets/toolset-10.15.json                  | 3 ++-
 images/macos/toolsets/toolset-11.json                     | 3 ++-
 images/macos/toolsets/toolset-12.json                     | 3 ++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 8ed019f9a..38a2cfc9e 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -517,6 +517,11 @@ function Get-JazzyVersion {
     return "Jazzy $jazzyVersion"
 }
 
+function Get-ZlibVersion {
+	$zlibVersion = (brew info zlib)[0] | Take-Part -Part 2
+	return "Zlib $zlibVersion"
+}
+
 function Build-PackageManagementEnvironmentTable {
     return @(
         @{
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 368d79764..a7016f904 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -291,6 +291,9 @@ $markdown += New-MDHeader "Environment variables" -Level 4
 $markdown += Build-AndroidEnvironmentTable | New-MDTable
 $markdown += New-MDNewLine
 
+$markdown += New-MDHeader "Miscellaneous" -Level 3
+$markdown += New-MDList -Lines @(Get-ZlibVersion) -Style Unordered
+
 #
 # Generate systeminfo.txt with information about image (for debug purpose)
 #
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 6176945b3..1db75e409 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -224,7 +224,8 @@
             "swiftformat",
             "swig",
             "xctool",
-            "zstd"
+            "zstd",
+            "zlib"
         ],
         "cask_packages": [
             "julia",
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 742cc8e30..adeb4f577 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -183,7 +183,8 @@
             "subversion",
             "swiftformat",
             "swig",
-            "zstd"
+            "zstd",
+            "zlib"
         ],
         "cask_packages": [
             "julia"
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 0ba53b03e..afaf701c4 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -98,7 +98,8 @@
             "subversion",
             "swig",
             "zstd",
-            "gmp"
+            "gmp",
+            "zlib"
         ],
         "cask_packages": [
             "julia"