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

Jump to bottom

[curl] Fix linker flags in curl-config and libcurl.pc for osx #17790

Merged
merged 4 commits into from
Jul 1, 2021
Merged

[curl] Fix linker flags in curl-config and libcurl.pc for osx #17790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54ed7b3
Fix exported framework linker flags for osx
dg0yt May 16, 2021
847795b
x-add-version
dg0yt May 29, 2021
f843e46
Remove cmake version check
dg0yt Jun 10, 2021
ba4b2db
Update git-tree
dg0yt Jun 10, 2021
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
16 changes: 16 additions & 0 deletions ports/curl/0020-fix-pc-file.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff -urw a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2021-05-10 20:46:52.204346972 +0200
+++ b/CMakeLists.txt 2021-05-11 19:39:00.065235266 +0200
@@ -1482,6 +1482,12 @@
message(WARNING "Bad lib in library list: ${_libname}")
continue()
endif()
+ elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$")
+ if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES)
+ set(_lib "-framework ${CMAKE_MATCH_2}")
+ else()
+ set(_lib "-framework ${_lib}")
+ endif()
endif()
if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-")
set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}")
1 change: 1 addition & 0 deletions ports/curl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ vcpkg_from_github(
0010_fix_othertests_cmake.patch
0011_fix_static_build.patch
0012-fix-dependency-idn2.patch
0020-fix-pc-file.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
Expand Down
2 changes: 1 addition & 1 deletion ports/curl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "curl",
"version": "7.74.0",
"port-version": 7,
"port-version": 8,
"description": "A library for transferring data with URLs",
"homepage": "https://github.com/curl/curl",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@
},
"curl": {
"baseline": "7.74.0",
"port-version": 7
"port-version": 8
},
"curlpp": {
"baseline": "2018-06-15-3",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/curl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028",
"version": "7.74.0",
"port-version": 8
},
{
"git-tree": "2184d79bb98ed36af015203385175cade013d8af",
"version": "7.74.0",
Expand Down