Skip to content

Commit

Permalink
Merge pull request #78 from regro-cf-autotick-bot/20240116.2_he072f1
Browse files Browse the repository at this point in the history
abseil-cpp v20240116.2
  • Loading branch information
xhochy authored Apr 29, 2024
2 parents 274cf19 + 8b08001 commit 3659d27
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 71 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -19,3 +23,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -23,3 +27,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -19,3 +23,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
4 changes: 4 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions azure-pipelines.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "20240116.1" %}
{% set version = "20240116.2" %}
{% set v_major = version.split(".")[0] %}
# needs to match across all dependent packages; using C++20
# is potentially problematic in some cases, see #45
Expand Down Expand Up @@ -28,7 +28,7 @@ package:

source:
url: https://github.com/abseil/abseil-cpp/archive/refs/tags/{{ version }}.tar.gz
sha256: 3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a
sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc
patches:
# Helps downstream packages import the dll without an extra define
# https://github.com/conda-forge/abseil-cpp-feedstock/issues/43#issuecomment-1242969515
Expand All @@ -37,11 +37,9 @@ 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/cfde5f74e276049727f9556f13473a59fe77d9eb
- patches/0004-Workaround-for-NVIDIA-C-compiler-being-unable-to-par.patch

build:
number: 2
number: 0

outputs:
# default behaviour is shared; however note that upstream does not support
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0001-default-dll-import-for-windows.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 681f595247ce7b1675e624f4d57959bfa70b11c0 Mon Sep 17 00:00:00 2001
From 46de26de379f8b611e63f10a15596c8e668a0042 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 1/4] default dll import for windows
Subject: [PATCH 1/3] default dll import for windows

---
absl/base/config.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/absl/base/config.h b/absl/base/config.h
index c9165acd..b0d5650c 100644
index 3933a3db..450ecb22 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -743,10 +743,9 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 925064703e6e48f36920c9f65a45efb4981ecb49 Mon Sep 17 00:00:00 2001
From deb68855f6be950a4555a9b07f514a9bd3575bd7 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Wed, 7 Feb 2024 17:07:42 +0100
Subject: [PATCH 2/4] don't use C++20 stdlib-features which change ABI compared
Subject: [PATCH 2/3] don't use C++20 stdlib-features which change ABI compared
to C++17 baseline

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f86ffcfba84ec681a70249a61be3b7d2c7f32fa4 Mon Sep 17 00:00:00 2001
From 0195301e0dbfe7fb5a570e3261273f4133757766 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Tue, 13 Feb 2024 08:43:06 +0100
Subject: [PATCH 3/4] unconditionally export Mutex Destructor
Subject: [PATCH 3/3] unconditionally export Mutex Destructor

---
absl/synchronization/mutex.cc | 2 --
Expand Down

This file was deleted.

0 comments on commit 3659d27

Please sign in to comment.