| Message ID | 20230330101536.533080-1-frank@lichtenheld.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] vcpkg: request "tools" feature of openssl for MSVC build | expand |
GHA seems happy about this change: https://github.com/flichtenheld/openvpn/actions/runs/4562871750/jobs/8050638911 Acked-by: Lev Stipakov <lstipakov@gmail.com> to 30. maalisk. 2023 klo 13.17 Frank Lichtenheld (frank@lichtenheld.com) kirjoitti: > > We need this for the MSI build. Previously this was enabled > by default. > > Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> > --- > .github/workflows/build.yaml | 2 +- > src/openvpn/vcpkg.json | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml > index 99ae437e..4766efdc 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 80645677..0afd802c 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", > -- > 2.34.1 > > > > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel
I have no idea what this is about, but I do not need to :-) - Frank and
Lev do building, and if they say this is what is needed...
Since it's related to MSI building, it needs to go into 2.6 as long
as we provide 2.6.x MSU builds ("for a while").
Your patch has been applied to the master and release/2.6 branch.
commit b1fc3f25bc27462100bf96d9b677d6a3c31d3303 (master)
commit 253a87dccf8c9645fade2426177489fcd8dd0ec8 (release/2.6)
Author: Frank Lichtenheld
Date: Thu Mar 30 12:15:36 2023 +0200
vcpkg: request tools feature of openssl for MSVC build
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>
--
kind regards,
Gert Doering
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 99ae437e..4766efdc 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 80645677..0afd802c 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",
We need this for the MSI build. Previously this was enabled by default. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- .github/workflows/build.yaml | 2 +- src/openvpn/vcpkg.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)