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.

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

[abseil] Add patch that fixed the CoreFoundation linkage #32781

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 36 additions & 0 deletions ports/abseil/core-foundation-deps.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From c205ad7b772efcf8c03bd898eb54791b42f1f762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 25 Jul 2023 00:20:55 +0200
Subject: [PATCH] Don't depend on CoreFoundation with an absolute path.

---
absl/time/CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt
index 7b72054..c3392ae 100644
--- a/absl/time/CMakeLists.txt
+++ b/absl/time/CMakeLists.txt
@@ -54,10 +54,6 @@ absl_cc_library(
${ABSL_DEFAULT_COPTS}
)

-if(APPLE)
- find_library(CoreFoundation CoreFoundation)
-endif()
-
absl_cc_library(
NAME
time_zone
@@ -84,7 +80,7 @@ absl_cc_library(
COPTS
${ABSL_DEFAULT_COPTS}
DEPS
- $<$<PLATFORM_ID:Darwin>:${CoreFoundation}>
+ $<$<PLATFORM_ID:Darwin>:-Wl,-framework,CoreFoundation>
)

# Internal-only target, do not depend on directly.
--
2.25.1

23 changes: 0 additions & 23 deletions ports/abseil/fix-32-bit-arm.patch

This file was deleted.

1 change: 1 addition & 0 deletions ports/abseil/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-dll-support.patch
core-foundation-deps.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/abseil/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "abseil",
"version": "20230125.3",
"port-version": 1,
"description": [
"an open-source collection designed to augment the C++ standard library.",
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
Expand Down
10 changes: 10 additions & 0 deletions versions/a-/abseil.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"versions": [
{
"git-tree": "370a6da6fa1c5e259a8c8deec863e705aa423be6",
"version": "20230125.3",
"port-version": 1
},
{
"git-tree": "2209360b556a40cf034551f6f9063456eac63986",
"version": "20230125.3",
"port-version": 2
},
{
"git-tree": "6a337fa251c0ac4489d9c0ea1e2f1c9a7d019eb5",
"version": "20230125.3",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"abseil": {
"baseline": "20230125.3",
"port-version": 0
"port-version": 1
},
"absent": {
"baseline": "0.3.1",
Expand Down