Skip to content

Commit

Permalink
libabseil v20240722.0 (#81)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Aug 1, 2024
2 parents 41be657 + f9fe5cd commit 660ce6a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 84 deletions.
10 changes: 3 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "20240116.2" %}
{% set version = "20240722.0" %}
{% 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,20 +28,16 @@ package:

source:
url: https://github.com/abseil/abseil-cpp/archive/refs/tags/{{ version }}.tar.gz
sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc
sha256: f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
patches:
# Helps downstream packages import the dll without an extra define
# https://github.com/conda-forge/abseil-cpp-feedstock/issues/43#issuecomment-1242969515
- patches/0001-default-dll-import-for-windows.patch
# avoid that compilation in C++20 mode changes the ABI vs. C++17
- 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: 1
number: 0

outputs:
# default behaviour is shared; however note that upstream does not support
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0001-default-dll-import-for-windows.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From 46de26de379f8b611e63f10a15596c8e668a0042 Mon Sep 17 00:00:00 2001
From e8044cc76e21b88ef92d36c62e56b8015b75f588 Mon Sep 17 00:00:00 2001
From: Mark Harfouche <[email protected]>
Date: Sun, 11 Sep 2022 10:32:19 -0400
Subject: [PATCH 1/3] default dll import for windows
Subject: [PATCH 1/2] 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 3933a3db..450ecb22 100644
index 0b22167e..56acb3ba 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -743,10 +743,9 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
@@ -705,10 +705,9 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
#if defined(_MSC_VER)
#if defined(ABSL_BUILD_DLL)
#define ABSL_DLL __declspec(dllexport)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From deb68855f6be950a4555a9b07f514a9bd3575bd7 Mon Sep 17 00:00:00 2001
From 1140318d3504be7e4b8c1dbc03eeb7d19da988d5 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Wed, 7 Feb 2024 17:07:42 +0100
Subject: [PATCH 2/3] don't use C++20 stdlib-features which change ABI compared
Subject: [PATCH 2/2] don't use C++20 stdlib-features which change ABI compared
to C++17 baseline

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 194f8708..1cf84398 100644
index 7c82b3a7..1d4f421f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,7 +234,7 @@ if(ABSL_ENABLE_INSTALL)
@@ -221,7 +221,7 @@ if(ABSL_ENABLE_INSTALL)
foreach(FEATURE "ORDERING")
string(REPLACE
"#define ABSL_OPTION_USE_STD_${FEATURE} 2"
Expand Down
43 changes: 0 additions & 43 deletions recipe/patches/0003-unconditionally-export-Mutex-Destructor.patch

This file was deleted.

This file was deleted.

0 comments on commit 660ce6a

Please sign in to comment.