Patch zlib to fix compatibility with latest Xcode (#18041)

Fixes #17956 Partial commit for third_party/*, see #17987. Closes #17987 Signed-off-by: Yun Peng <pcloudy@google.com> Co-authored-by: Yun Peng <pcloudy@google.com>
bazelbuild · Apr 12, 2023 · cae02a9 · cae02a9
1 parent 12f79d3
commit cae02a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h
@@ -3,6 +3,10 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#ifndef _WIN32
+  #include <unistd.h>
+#endif
+
 #ifdef _LARGEFILE64_SOURCE
 #  ifndef _LARGEFILE_SOURCE
 #    define _LARGEFILE_SOURCE 1

diff --git a/third_party/zlib/zlib.patch b/third_party/zlib/zlib.patch
@@ -0,0 +1,15 @@
+diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h
+index 57faf37165..54f668fcb2 100644
+--- a/third_party/zlib/gzguts.h
++++ b/third_party/zlib/gzguts.h
+@@ -3,6 +3,10 @@
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+
++#ifndef _WIN32
++  #include <unistd.h>
++#endif
++
+ #ifdef _LARGEFILE64_SOURCE
+ #  ifndef _LARGEFILE_SOURCE
+ #    define _LARGEFILE_SOURCE 1