Backport CMake configuration fix for test_allocator (#80)

automerged PR by conda-forge/automerge-action
conda-forge · Jul 13, 2024 · 41be657 · 41be657
2 parents 622c111 + 944d5c2
commit 41be657
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 18 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -5,9 +5,9 @@ c_compiler_version:
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -37,9 +37,11 @@ source:
     - patches/0002-don-t-use-C-20-stdlib-features-which-change-ABI-comp.patch
     # workaround for https://github.com/abseil/abseil-cpp/issues/1624
     - patches/0003-unconditionally-export-Mutex-Destructor.patch
+    # backport https://github.com/abseil/abseil-cpp/commit/779a3565ac6c5b69dd1ab9183e500a27633117d5
+    - patches/0004-Avoid-export-of-testonly-target-absl-test_allocator-.patch
 
 build:
-  number: 0
+  number: 1
 
 outputs:
   # default behaviour is shared; however note that upstream does not support
@@ -53,26 +55,23 @@ outputs:
         - {{ pin_subpackage("libabseil", max_pin="x") }}
         # also pin on ABI variant
         - libabseil =*=cxx{{ cxx_standard }}*
-        # abseil needs the 10.13 headers even just to be `# include`d;
-        # ensure that all dependent packages reflect that to
-        # avoid the solver getting stuck in no-man's-land.
-        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}  # [osx and x86_64]
 
     requirements:
       build:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
+        - {{ stdlib('c') }}
         - cmake
         - ninja
       run_constrained:
         - libabseil-static ={{ version }}=cxx{{ cxx_standard }}*
         # make sure we don't co-install with old version of old package name
         - abseil-cpp ={{ version }}
-        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}  # [osx and x86_64]
 
     test:
       requires:
         - {{ compiler('cxx') }}
+        - {{ stdlib('c') }}
         - cmake
         - ninja
         - pkg-config
@@ -140,6 +139,7 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
+        - {{ stdlib('c') }}
         - cmake
         - ninja
       host:

diff --git a/recipe/patches/0004-Avoid-export-of-testonly-target-absl-test_allocator-.patch b/recipe/patches/0004-Avoid-export-of-testonly-target-absl-test_allocator-.patch
@@ -0,0 +1,26 @@
+From 0d297340775316a5ac8ccafd91dca0f00a6828f0 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <[email protected]>
+Date: Tue, 30 Jan 2024 10:13:25 -0800
+Subject: [PATCH 4/4] Avoid export of testonly target absl::test_allocator in
+ CMake builds
+
+Closes #1536
+
+PiperOrigin-RevId: 602764437
+Change-Id: Ia5c20a3874262a2ddb8797f608af17d7e86dd6d6
+---
+ absl/container/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
+index 128cc0e9..11d65d55 100644
+--- a/absl/container/CMakeLists.txt
++++ b/absl/container/CMakeLists.txt
+@@ -213,6 +213,7 @@ absl_cc_library(
+   DEPS
+     absl::config
+     GTest::gmock
++  TESTONLY
+ )
+
+ absl_cc_test(