-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Apply the patch for vcpkg to disable IPv6 for curl's macOS build
- Loading branch information
1 parent
7908cc3
commit 4b547c3
Showing
4 changed files
with
77 additions
and
5 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 |
---|---|---|
@@ -0,0 +1,40 @@ | ||
#!/usr/bin/env bash | ||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
# | ||
|
||
cd `dirname $0`/.. | ||
set -ex | ||
|
||
cd vcpkg | ||
# Ensure the vcpkg binary is available | ||
./bootstrap-vcpkg.sh | ||
git apply ../build-support/vcpkg-curl-patch.diff | ||
git commit -m "Disable IPv6 for macOS in curl" | ||
./vcpkg x-add-version --all | ||
git add versions/ | ||
git commit -m "Update version" | ||
COMMIT_ID=$(git log --pretty=oneline | head -n 1 | awk '{print $1}') | ||
|
||
# Update the vcpkg.json | ||
cd .. | ||
sed -i.bak "s/.*builtin-baseline.*/ \"builtin-baseline\": \"$COMMIT_ID\",/" vcpkg.json | ||
sed -i.bak "s/\"version>=\": \"8\.4\.0\"/\"version>=\": \"8.4.0#1\"/" vcpkg.json | ||
|
||
# "builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad", | ||
# "version>=": "8.4.0" |
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 |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake | ||
index bdc544e9e..340d93865 100644 | ||
--- a/ports/curl/portfile.cmake | ||
+++ b/ports/curl/portfile.cmake | ||
@@ -64,6 +64,10 @@ if(VCPKG_TARGET_IS_WINDOWS) | ||
list(APPEND OPTIONS -DENABLE_UNICODE=ON) | ||
endif() | ||
|
||
+if(VCPKG_TARGET_IS_OSX) | ||
+ list(APPEND OPTIONS -DENABLE_IPV6=OFF) | ||
+endif() | ||
+ | ||
vcpkg_cmake_configure( | ||
SOURCE_PATH "${SOURCE_PATH}" | ||
OPTIONS | ||
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json | ||
index e028d3897..a63858e34 100644 | ||
--- a/ports/curl/vcpkg.json | ||
+++ b/ports/curl/vcpkg.json | ||
@@ -1,6 +1,7 @@ | ||
{ | ||
"name": "curl", | ||
"version": "8.4.0", | ||
+ "port-version": 1, | ||
"description": "A library for transferring data with URLs", | ||
"homepage": "https://curl.se/", | ||
"license": "curl AND ISC AND BSD-3-Clause", |
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