add patch for osx

conda-forge · Jul 1, 2022 · 453eb00 · 453eb00
1 parent 25985fb
commit 453eb00
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -12,6 +12,7 @@ source:
     - patches/0001-patch-out-the-build-issue-on-clang4-osx.patch
     - patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch
     - patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch
+    - patches/0004-add-missing-osx-workaround.patch
 
 build:
   number: 0

diff --git a/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch
@@ -1,7 +1,7 @@
 From 336f3e70a058f6b07aa25725ea2a23a739f190ef Mon Sep 17 00:00:00 2001
 From: Francesco Biscani <bluescarni@gmail.com>
 Date: Sat, 21 Sep 2019 15:05:46 +0200
-Subject: [PATCH 1/3] patch out the build issue on clang4 osx
+Subject: [PATCH 1/4] patch out the build issue on clang4 osx
 
 ---
  absl/time/internal/cctz/include/cctz/civil_time_detail.h | 4 ++++

diff --git a/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch
@@ -1,7 +1,7 @@
 From a99ff2d64fb489dfc207572edb2d8a151d3c92f9 Mon Sep 17 00:00:00 2001
 From: Francesco Biscani <bluescarni@gmail.com>
 Date: Sat, 21 Sep 2019 21:39:26 +0200
-Subject: [PATCH 2/3] fix for linking to the CoreFoundation framework on OSX
+Subject: [PATCH 2/4] fix for linking to the CoreFoundation framework on OSX
 
 ---
  absl/time/CMakeLists.txt | 6 ++++--

diff --git a/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch
@@ -1,7 +1,7 @@
 From 1a77917fe7c5c3feece1a608d5537f848f4e930f Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Thu, 30 Jul 2020 13:01:32 +0200
-Subject: [PATCH 3/3] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS
+Subject: [PATCH 3/4] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS
 
 see also https://github.com/microsoft/vcpkg/issues/13945
 ---

diff --git a/recipe/patches/0004-add-missing-osx-workaround.patch b/recipe/patches/0004-add-missing-osx-workaround.patch
@@ -0,0 +1,27 @@
+From 3b5f3943a593d5c7544b594d0bd6eec569d26067 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <h.vetinari@gmx.com>
+Date: Fri, 1 Jul 2022 13:37:17 +0200
+Subject: [PATCH 4/4] add missing osx workaround
+
+---
+ absl/debugging/internal/examine_stack.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 5bdd341e..e86f384f 100644
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -26,6 +26,10 @@
+ #include <sys/mman.h>
+ #endif
+
++#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
++#define MAP_ANONYMOUS MAP_ANON
++#endif
++
+ #if defined(__linux__) || defined(__APPLE__)
+ #include <sys/ucontext.h>
+ #endif
+-- 
+2.35.3.windows.1
+