reinstate backport of upstream PR 1115

conda-forge · Feb 7, 2023 · 50b90d6 · 50b90d6
1 parent 38ade21
commit 50b90d6
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 7 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -29,9 +29,11 @@ source:
     - 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
+    # backport of https://github.com/abseil/abseil-cpp/pull/1115
+    - patches/0005-fix-some-missing-ABSL_INTERNAL_DLL_TARGETS-for-share.patch
     # Helps downstream packages import the dll without an extra define
     # https://github.com/conda-forge/abseil-cpp-feedstock/issues/43#issuecomment-1242969515
-    - patches/0005-default-dll-import-for-windows.patch  # [win and shared_libs == "ON"]
+    - patches/0006-default-dll-import-for-windows.patch  # [win and shared_libs == "ON"]
 
 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 d59eb9046823f39006350a508e30bac815b63383 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/5] patch out the build issue on clang4 osx
+Subject: [PATCH 1/6] 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 c8bd75a96ecb2bd528399829692307a03985da0b 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/5] fix for linking to the CoreFoundation framework on OSX
+Subject: [PATCH 2/6] 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 dfbac02988c119967037c53a0f78f03bdf01e1c8 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/5] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS
+Subject: [PATCH 3/6] 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
@@ -1,7 +1,7 @@
 From b6c0b4ffa8aa2ed4146e2c9ca9b0406e2da4f1d3 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/5] add missing osx workaround
+Subject: [PATCH 4/6] add missing osx workaround
 
 ---
  absl/debugging/internal/examine_stack.cc | 4 ++++

diff --git a/recipe/patches/0005-fix-some-missing-ABSL_INTERNAL_DLL_TARGETS-for-share.patch b/recipe/patches/0005-fix-some-missing-ABSL_INTERNAL_DLL_TARGETS-for-share.patch
@@ -0,0 +1,66 @@
+From 54b57e1ccc6f2a9786f240a376d33eaf34daf3d2 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <h.vetinari@gmx.com>
+Date: Tue, 7 Feb 2023 13:01:27 +1100
+Subject: [PATCH 5/6] fix some missing ABSL_INTERNAL_DLL_TARGETS for shared
+ builds
+
+---
+ CMake/AbseilDll.cmake | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
+index c4a41e6d..eec6dd99 100644
+--- a/CMake/AbseilDll.cmake
++++ b/CMake/AbseilDll.cmake
+@@ -448,8 +448,14 @@ set(ABSL_INTERNAL_DLL_TARGETS
+   "container_common"
+   "container_memory"
+   "cord"
++  "cord_internal"
++  "cordz_functions"
++  "cordz_handle"
++  "cordz_info"
++  "cordz_sample_token"
+   "core_headers"
+   "counting_allocator"
++  "crc_cord_state"
+   "crc_cpu_detect"
+   "crc_internal"
+   "crc32c"
+@@ -498,12 +504,14 @@ set(ABSL_INTERNAL_DLL_TARGETS
+   "log_initialize"
+   "log"
+   "log_entry"
++  "log_flags"
+   "log_sink"
+   "log_sink_registry"
+   "log_streamer"
+   "log_internal_structured"
+   "log_severity"
+   "log_structured"
++  "low_level_hash"
+   "malloc_internal"
+   "memory"
+   "meta"
+@@ -555,8 +563,10 @@ set(ABSL_INTERNAL_DLL_TARGETS
+   "stack_consumption"
+   "stacktrace"
+   "status"
++  "statusor"
+   "str_format"
+   "str_format_internal"
++  "strerror"
+   "strings"
+   "strings_internal"
+   "symbolize"
+@@ -588,6 +598,7 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS
+   "cordz_test_helpers"
+   "hash_testing"
+   "random_mocking_bit_gen"
++  "random_internal_distribution_test_util"
+   "random_internal_mock_overload_set"
+   "scoped_mock_log"
+ )
+-- 
+2.38.1.windows.1
+
diff --git a/...0005-default-dll-import-for-windows.patch → ...0006-default-dll-import-for-windows.patch b/...0005-default-dll-import-for-windows.patch → ...0006-default-dll-import-for-windows.patch
@@ -1,7 +1,7 @@
-From 68bdbcb32259d6fb92e2d0d723e8f79204462fc7 Mon Sep 17 00:00:00 2001
+From 08797647a52610ac2437c4d1b0c3af38d2704fd4 Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <mark.harfouche@gmail.com>
 Date: Sun, 11 Sep 2022 10:32:19 -0400
-Subject: [PATCH 5/5] default dll import for windows
+Subject: [PATCH 6/6] default dll import for windows
 
 ---
  absl/base/config.h | 5 ++---