Skip to content

Commit 2693133

Browse files
committed
Fix macOS build
1 parent 40f0568 commit 2693133

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

pkg/mac/build-static-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ git commit -m "Update version"
4848
COMMIT_ID=$(git log --pretty=oneline | head -n 1 | awk '{print $1}')
4949
cd ..
5050
sed -i.bak "s/.*builtin-baseline.*/ \"builtin-baseline\": \"$COMMIT_ID\",/" vcpkg.json
51-
sed -i.bak "s/\"version>=\": \"8\.4\.0\"/\"version>=\": \"8.4.0#1\"/" vcpkg.json
51+
sed -i.bak "s/\"version>=\": \"8\.13\.0#1\"/\"version>=\": \"8.13.0#2\"/" vcpkg.json
5252

5353
INSTALL_DIR=$PWD/pkg/mac/.install
5454
set -x

pkg/mac/vcpkg-curl-patch.diff

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
2-
index bdc544e9e..340d93865 100644
2+
index 427bccb217..ddfd75d30f 100644
33
--- a/ports/curl/portfile.cmake
44
+++ b/ports/curl/portfile.cmake
5-
@@ -64,6 +64,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
5+
@@ -62,6 +62,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
66
list(APPEND OPTIONS -DENABLE_UNICODE=ON)
77
endif()
88

99
+if(VCPKG_TARGET_IS_OSX)
1010
+ list(APPEND OPTIONS -DENABLE_IPV6=OFF)
1111
+endif()
1212
+
13+
vcpkg_find_acquire_program(PKGCONFIG)
14+
1315
vcpkg_cmake_configure(
14-
SOURCE_PATH "${SOURCE_PATH}"
15-
OPTIONS
1616
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
17-
index e028d3897..a63858e34 100644
17+
index 31955859d0..50e619b846 100644
1818
--- a/ports/curl/vcpkg.json
1919
+++ b/ports/curl/vcpkg.json
20-
@@ -1,6 +1,7 @@
20+
@@ -1,7 +1,7 @@
2121
{
2222
"name": "curl",
23-
"version": "8.4.0",
24-
+ "port-version": 1,
23+
"version": "8.13.0",
24+
- "port-version": 1,
25+
+ "port-version": 2,
2526
"description": "A library for transferring data with URLs",
2627
"homepage": "https://curl.se/",
2728
"license": "curl AND ISC AND BSD-3-Clause",

0 commit comments

Comments
 (0)