experimental patches for fixing missing symbols on windows

recipe/meta.yaml

@@ -9,13 +9,15 @@ source:
   url: https://github.com/abseil/{{ name }}/archive/{{ version }}.tar.gz
   sha256: dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
   patches:
-    #- linux-librt.patch  # [linux]
-    - clang4_osx_fix.diff  # [osx]
-    - osx_framework_fix.diff  # [osx]
-    - remove-4221.patch  # [win]
+    - 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
+    # experimental
+    - patches/0004-alphabetize-ABSL_INTERNAL_DLL_TARGETS.patch
+    - patches/0005-add-some-missing-internal-dll-targets.patch
 
 build:
-  number: 1
+  number: 2
   run_exports:
     - {{ pin_subpackage("abseil-cpp", max_pin="x.x") }}
 

recipe/clang4_osx_fix.diff → recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch

@@ -1,5 +1,14 @@
+From 50b8f574cfc8a6868f9fc74741c384f50e3ef540 Mon Sep 17 00:00:00 2001
+From: Francesco Biscani <[email protected]>
+Date: Sat, 21 Sep 2019 15:05:46 +0200
+Subject: [PATCH 1/5] patch out the build issue on clang4 osx
+
+---
+ absl/time/internal/cctz/include/cctz/civil_time_detail.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
 diff --git a/absl/time/internal/cctz/include/cctz/civil_time_detail.h b/absl/time/internal/cctz/include/cctz/civil_time_detail.h
-index 53e087a..3db7dca 100644
+index 8aadde5..2dac15c 100644
 --- a/absl/time/internal/cctz/include/cctz/civil_time_detail.h
 +++ b/absl/time/internal/cctz/include/cctz/civil_time_detail.h
 @@ -15,6 +15,10 @@
@@ -13,3 +22,6 @@ index 53e087a..3db7dca 100644
  #include <cstdint>
  #include <limits>
  #include <ostream>
+-- 
+2.35.1.windows.2
+

recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch

@@ -0,0 +1,31 @@
+From 341b5875ad617a45600d19ac03d78e68ef8a39b0 Mon Sep 17 00:00:00 2001
+From: Francesco Biscani <[email protected]>
+Date: Sat, 21 Sep 2019 21:39:26 +0200
+Subject: [PATCH 2/5] fix for linking to the CoreFoundation framework on OSX
+
+---
+ absl/time/CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt
+index f6ff8bd..ba7f65f 100644
+--- a/absl/time/CMakeLists.txt
++++ b/absl/time/CMakeLists.txt
+@@ -83,10 +83,12 @@ absl_cc_library(
+     "internal/cctz/src/zone_info_source.cc"
+   COPTS
+     ${ABSL_DEFAULT_COPTS}
+-  DEPS
+-    $<$<PLATFORM_ID:Darwin>:${CoreFoundation}>
+ )
+
++if(APPLE)
++  target_link_options(time_zone PUBLIC -framework CoreFoundation)
++endif()
++
+ absl_cc_library(
+   NAME
+     time_internal_test_util
+-- 
+2.35.1.windows.2
+

recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch

@@ -0,0 +1,45 @@
+From 958c72f3853ff0c7ab1d9718aedd3ec34b7e5c45 Mon Sep 17 00:00:00 2001
+From: "Uwe L. Korn" <[email protected]>
+Date: Thu, 30 Jul 2020 13:01:32 +0200
+Subject: [PATCH 3/5] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS
+
+see also https://github.com/microsoft/vcpkg/issues/13945
+---
+ absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
+ absl/copts/copts.py                    | 5 +----
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
+index a4ab1aa..f2cdfa0 100644
+--- a/absl/copts/GENERATED_AbseilCopts.cmake
++++ b/absl/copts/GENERATED_AbseilCopts.cmake
+@@ -135,10 +135,6 @@ list(APPEND ABSL_MSVC_FLAGS
+     "/wd4800"
+ )
+
+-list(APPEND ABSL_MSVC_LINKOPTS
+-    "-ignore:4221"
+-)
+-
+ list(APPEND ABSL_MSVC_TEST_FLAGS
+     "/wd4018"
+     "/wd4101"
+diff --git a/absl/copts/copts.py b/absl/copts/copts.py
+index 0d6c1ec..8df9275 100644
+--- a/absl/copts/copts.py
++++ b/absl/copts/copts.py
+@@ -148,10 +148,7 @@ COPT_VARS = {
+         "/wd4996",  # use of deprecated symbol
+         "/DNOMINMAX",  # disable the min() and max() macros from <windows.h>
+     ],
+-    "ABSL_MSVC_LINKOPTS": [
+-        # Object file doesn't export any previously undefined symbols
+-        "-ignore:4221",
+-    ],
++    "ABSL_MSVC_LINKOPTS": [],
+     # "HWAES" is an abbreviation for "hardware AES" (AES - Advanced Encryption
+     # Standard). These flags are used for detecting whether or not the target
+     # architecture has hardware support for AES instructions which can be used
+-- 
+2.35.1.windows.2
+

recipe/patches/0004-alphabetize-ABSL_INTERNAL_DLL_TARGETS.patch

@@ -0,0 +1,225 @@
+From 797e292cfc7c733ca31120a4637fd91a1e9ea85d Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <[email protected]>
+Date: Wed, 2 Mar 2022 08:07:20 +1100
+Subject: [PATCH 4/5] alphabetize ABSL_INTERNAL_DLL_TARGETS
+
+---
+ CMake/AbseilDll.cmake | 174 +++++++++++++++++++++---------------------
+ 1 file changed, 87 insertions(+), 87 deletions(-)
+
+diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
+index fa323ff..2c7f162 100644
+--- a/CMake/AbseilDll.cmake
++++ b/CMake/AbseilDll.cmake
+@@ -344,121 +344,121 @@ set(ABSL_INTERNAL_DLL_FILES
+ )
+
+ set(ABSL_INTERNAL_DLL_TARGETS
+-  "stacktrace"
+-  "symbolize"
+-  "examine_stack"
+-  "failure_signal_handler"
+-  "debugging_internal"
+-  "demangle_internal"
+-  "leak_check"
+-  "leak_check_disable"
+-  "stack_consumption"
+-  "debugging"
+-  "hash"
+-  "spy_hash_state"
+-  "city"
+-  "memory"
+-  "strings"
+-  "strings_internal"
+-  "cord"
+-  "str_format"
+-  "str_format_internal"
+-  "pow10_helper"
+-  "int128"
+-  "numeric"
+-  "utility"
++  "algorithm"
++  "algorithm_container"
+   "any"
++  "atomic_hook"
+   "bad_any_cast"
+   "bad_any_cast_impl"
+-  "span"
+-  "optional"
+   "bad_optional_access"
+   "bad_variant_access"
+-  "variant"
+-  "compare"
+-  "algorithm"
+-  "algorithm_container"
+-  "graphcycles_internal"
+-  "kernel_timeout_internal"
+-  "synchronization"
+-  "thread_pool"
++  "base"
++  "base_internal"
+   "bind_front"
+-  "function_ref"
+-  "atomic_hook"
+-  "log_severity"
+-  "raw_logging_internal"
+-  "spinlock_wait"
++  "bits"
++  "btree"
++  "city"
++  "civil_time"
++  "compare"
++  "compressed_tuple"
+   "config"
+-  "dynamic_annotations"
++  "container"
++  "container_common"
++  "container_memory"
++  "cord"
+   "core_headers"
+-  "malloc_internal"
+-  "base_internal"
+-  "base"
+-  "throw_delegate"
+-  "pretty_function"
++  "counting_allocator"
++  "debugging"
++  "debugging_internal"
++  "demangle_internal"
++  "dynamic_annotations"
+   "endian"
+-  "bits"
++  "examine_stack"
+   "exponential_biased"
+-  "periodic_sampler"
+-  "scoped_set_env"
+-  "type_traits"
++  "failure_signal_handler"
++  "fixed_array"
++  "flat_hash_map"
++  "flat_hash_set"
++  "function_ref"
++  "graphcycles_internal"
++  "hash"
++  "hash_function_defaults"
++  "hash_policy_traits"
++  "hashtable_debug"
++  "hashtable_debug_hooks"
++  "hashtablez_sampler"
++  "have_sse"
++  "inlined_vector"
++  "inlined_vector_internal"
++  "int128"
++  "kernel_timeout_internal"
++  "layout"
++  "leak_check"
++  "leak_check_disable"
++  "log_severity"
++  "malloc_internal"
++  "memory"
+   "meta"
+-  "random_random"
++  "node_hash_map"
++  "node_hash_policy"
++  "node_hash_set"
++  "numeric"
++  "optional"
++  "periodic_sampler"
++  "pow10_helper"
++  "pretty_function"
+   "random_bit_gen_ref"
+   "random_distributions"
+-  "random_seed_gen_exception"
+-  "random_seed_sequences"
+-  "random_internal_traits"
+   "random_internal_distribution_caller"
+   "random_internal_distributions"
+-  "random_internal_fast_uniform_bits"
+-  "random_internal_seed_material"
+-  "random_internal_pool_urbg"
+   "random_internal_explicit_seed_seq"
+-  "random_internal_sequence_urbg"
+-  "random_internal_salted_seed_seq"
+-  "random_internal_iostream_state_saver"
+-  "random_internal_generate_real"
+-  "random_internal_wide_multiply"
++  "random_internal_fast_uniform_bits"
+   "random_internal_fastmath"
++  "random_internal_generate_real"
++  "random_internal_iostream_state_saver"
+   "random_internal_nonsecure_base"
+   "random_internal_pcg_engine"
+-  "random_internal_randen_engine"
+   "random_internal_platform"
++  "random_internal_pool_urbg"
+   "random_internal_randen"
+-  "random_internal_randen_slow"
++  "random_internal_randen_engine"
+   "random_internal_randen_hwaes"
+   "random_internal_randen_hwaes_impl"
++  "random_internal_randen_slow"
++  "random_internal_salted_seed_seq"
++  "random_internal_seed_material"
++  "random_internal_sequence_urbg"
++  "random_internal_traits"
+   "random_internal_uniform_helper"
++  "random_internal_wide_multiply"
++  "random_random"
++  "random_seed_gen_exception"
++  "random_seed_sequences"
++  "raw_hash_map"
++  "raw_hash_set"
++  "raw_logging_internal"
++  "sample_recorder"
++  "scoped_set_env"
++  "span"
++  "spinlock_wait"
++  "spy_hash_state"
++  "stack_consumption"
++  "stacktrace"
+   "status"
++  "str_format"
++  "str_format_internal"
++  "strings"
++  "strings_internal"
++  "symbolize"
++  "synchronization"
++  "thread_pool"
++  "throw_delegate"
+   "time"
+-  "civil_time"
+   "time_zone"
+-  "container"
+-  "btree"
+-  "compressed_tuple"
+-  "fixed_array"
+-  "inlined_vector_internal"
+-  "inlined_vector"
+-  "counting_allocator"
+-  "flat_hash_map"
+-  "flat_hash_set"
+-  "node_hash_map"
+-  "node_hash_set"
+-  "container_memory"
+-  "hash_function_defaults"
+-  "hash_policy_traits"
+-  "hashtablez_sampler"
+-  "hashtable_debug"
+-  "hashtable_debug_hooks"
+-  "have_sse"
+-  "node_hash_policy"
+-  "raw_hash_map"
+-  "container_common"
+-  "raw_hash_set"
+-  "layout"
+   "tracked"
+-  "sample_recorder"
++  "type_traits"
++  "utility"
++  "variant"
+ )
+
+ function(absl_internal_dll_contains)
+-- 
+2.35.1.windows.2
+