Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport updated upstream fix for shared windows builds including test deps. #60

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Backport updated upstream fix for shared windows builds including test deps. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84abb98
backport updated upstream fix
h-vetinari May 13, 2023
3af907e
bump build number
h-vetinari May 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,12 @@ source:
# backport https://github.com/abseil/abseil-cpp/commit/807763a7f57dcf0ba4af7c3b218013e8f525e811
# to be able to install TESTONLY libraries
- patches/0008-CMake-Install-TESTONLY-libraries-and-their-dependenc.patch
# backport abseil/abseil-cpp#1445 for shared builds including test targets on win
- patches/0009-add-some-necessary-source-files-to-ABSL_INTERNAL_TES.patch
- patches/0010-update-ABSL_CC_TEST_LINKOPTS-when-using-shared-build.patch
- patches/0011-make-CordzHandle-and-relevant-internal-state-use-ABS.patch
# backport https://github.com/abseil/abseil-cpp/commit/3aa3377ef66e6388ed19fd7c862bf0dc3a3630e0
# for being able to do shared builds on windows that include test targets
- patches/0009-Fixed-Windows-DLL-builds-of-test-targets.patch

build:
number: 0
number: 1

outputs:
# default behaviour is shared; however note that upstream does not support
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d59eb9046823f39006350a508e30bac815b63383 Mon Sep 17 00:00:00 2001
From 57462c7072aba63962b96a2bff3d1dd49b20ebd1 Mon Sep 17 00:00:00 2001
From: Francesco Biscani <[email protected]>
Date: Sat, 21 Sep 2019 15:05:46 +0200
Subject: [PATCH 01/11] patch out the build issue on clang4 osx
Subject: [PATCH 1/9] patch out the build issue on clang4 osx

---
absl/time/internal/cctz/include/cctz/civil_time_detail.h | 4 ++++
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c8bd75a96ecb2bd528399829692307a03985da0b Mon Sep 17 00:00:00 2001
From 646038c51223f0d79575a76decdff6f8b51e4ec9 Mon Sep 17 00:00:00 2001
From: Francesco Biscani <[email protected]>
Date: Sat, 21 Sep 2019 21:39:26 +0200
Subject: [PATCH 02/11] fix for linking to the CoreFoundation framework on OSX
Subject: [PATCH 2/9] fix for linking to the CoreFoundation framework on OSX

---
absl/time/CMakeLists.txt | 6 ++++--
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From dfbac02988c119967037c53a0f78f03bdf01e1c8 Mon Sep 17 00:00:00 2001
From ea8ae30ef865c85511a02ee7ec6dd8cd0942a7c5 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Thu, 30 Jul 2020 13:01:32 +0200
Subject: [PATCH 03/11] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS
Subject: [PATCH 3/9] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS

see also https://github.com/microsoft/vcpkg/issues/13945
---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0004-add-missing-osx-workaround.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b6c0b4ffa8aa2ed4146e2c9ca9b0406e2da4f1d3 Mon Sep 17 00:00:00 2001
From 604adbf676a3d8dfb57e52cfd6e4e00c82197564 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Fri, 1 Jul 2022 13:37:17 +0200
Subject: [PATCH 04/11] add missing osx workaround
Subject: [PATCH 4/9] add missing osx workaround

---
absl/debugging/internal/examine_stack.cc | 4 ++++
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0005-fix-some-missing-ABSL_INTERNAL_DLL_TARGETS-for-share.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d6480ef5044ab0cb548dcae070327481a9da46c9 Mon Sep 17 00:00:00 2001
From 12ce83f3071ac21d2544b492bedac015dd2a8840 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Tue, 7 Feb 2023 13:01:27 +1100
Subject: [PATCH 05/11] fix some missing ABSL_INTERNAL_DLL_TARGETS for shared
Subject: [PATCH 5/9] fix some missing ABSL_INTERNAL_DLL_TARGETS for shared
builds

---
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0006-default-dll-import-for-windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From d062fa3db9557ec227a40af6c40727249499022f Mon Sep 17 00:00:00 2001
From 8f5ba701f608a5c367ea6295b5378355456c363c Mon Sep 17 00:00:00 2001
From: Mark Harfouche <[email protected]>
Date: Sun, 11 Sep 2022 10:32:19 -0400
Subject: [PATCH 06/11] default dll import for windows
Subject: [PATCH 6/9] 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 e35d2e48..391da4de 100644
index 0631ab60..529c2c12 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -750,10 +750,9 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0007-Fix-ABSL_PROPAGATE_CXX_STD-cmake-option.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From dd56821ac6927441e33387072b8dc3c3569644a4 Mon Sep 17 00:00:00 2001
From 126ba22d4190c2f6cd61c3db64608b68522570e6 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Wed, 15 Feb 2023 15:55:54 +0100
Subject: [PATCH 07/11] Fix ABSL_PROPAGATE_CXX_STD cmake option
Subject: [PATCH 7/9] Fix ABSL_PROPAGATE_CXX_STD cmake option

---
CMake/AbseilDll.cmake | 6 +++---
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0008-CMake-Install-TESTONLY-libraries-and-their-dependenc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
From 4ed51580e60f87f0cdd2024b407aa6688f65c5ef Mon Sep 17 00:00:00 2001
From 48c9ff9c870b45bfc770d2765b0ea50cc0aef082 Mon Sep 17 00:00:00 2001
From: Derek Mauro <[email protected]>
Date: Thu, 2 Mar 2023 17:32:02 -0800
Subject: [PATCH 08/11] CMake: Install TESTONLY libraries and their
dependencies when they are built
Subject: [PATCH 8/9] CMake: Install TESTONLY libraries and their dependencies
when they are built

https://github.com/abseil/abseil-cpp/issues/1407

Expand Down
Loading