-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
automerged PR by conda-forge/automerge-action
- Loading branch information
Showing
5 changed files
with
11 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
|
8 changes: 4 additions & 4 deletions
8
recipe/patches/0002-don-t-use-C-20-stdlib-features-which-change-ABI-comp.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
|
43 changes: 0 additions & 43 deletions
43
recipe/patches/0003-unconditionally-export-Mutex-Destructor.patch
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
recipe/patches/0004-Avoid-export-of-testonly-target-absl-test_allocator-.patch
This file was deleted.
Oops, something went wrong.