aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld2023-03-30 12:15:36 +0200
committerGert Doering2023-03-30 12:56:31 +0200
commit253a87dccf8c9645fade2426177489fcd8dd0ec8 (patch)
treef1643dd779d0d297fcfb89692172eaac84e5a689
parente5c436c2cb8a19d0a926aa14a2f2a31385f3eaee (diff)
downloadopenvpn-253a87dccf8c9645fade2426177489fcd8dd0ec8.zip
openvpn-253a87dccf8c9645fade2426177489fcd8dd0ec8.tar.gz
vcpkg: request "tools" feature of openssl for MSVC build
We need this for the MSI build. Previously this was enabled by default. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Lev Stipakov <lstipakov@gmail.com> Message-Id: <20230330101536.533080-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26561.html Signed-off-by: Gert Doering <gert@greenie.muc.de> (cherry picked from commit b1fc3f25bc27462100bf96d9b677d6a3c31d3303)
-rw-r--r--.github/workflows/build.yaml2
-rw-r--r--src/openvpn/vcpkg.json5
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 99ae437..4766efd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -440,7 +440,7 @@ jobs:
- name: Restore artifacts, or setup vcpkg (do not install any package)
uses: lukka/run-vcpkg@v10
with:
- vcpkgGitCommitId: 'cafd398be781144787573ca78390e951673c7055'
+ vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010'
appendedCacheKey: '${{matrix.triplet}}'
- name: Run MSBuild consuming vcpkg.json
diff --git a/src/openvpn/vcpkg.json b/src/openvpn/vcpkg.json
index 8064567..0afd802 100644
--- a/src/openvpn/vcpkg.json
+++ b/src/openvpn/vcpkg.json
@@ -3,7 +3,10 @@
"name": "openvpn",
"version": "2.6",
"dependencies": [
- "openssl",
+ {
+ "name": "openssl",
+ "features": ["tools"]
+ },
"tap-windows6",
"lzo",
"lz4",