Skip to content

[openssl-windows] [ffmpeg] [xeus] wrap FindOpenSSL to ensure crypt32 and ws2_32 are added to libraries to be statically linked #14309

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

Closed
mcmtroffaes wants to merge 3 commits into from
Closed

[openssl-windows] [ffmpeg] [xeus] wrap FindOpenSSL to ensure crypt32 and ws2_32 are added to libraries to be statically linked #14309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1572876
[openssl-windows] wrap FindOpenSSL to ensure crypt32 and ws2_32 are a…
mcmtroffaes Oct 29, 2020
da0785f
[ffmpeg] use OPENSSL_LIBRARIES generated by upstream cmake FindOpenSS…
mcmtroffaes Oct 28, 2020
2811b66
[xeus] remove openssl static build patch as it is no longer needed
mcmtroffaes Oct 30, 2020
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
2 changes: 1 addition & 1 deletion ports/ffmpeg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: ffmpeg
Version: 4.3.1
Port-Version: 3
Port-Version: 4
Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
Expand Down
6 changes: 1 addition & 5 deletions ports/ffmpeg/FindFFMPEG.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,7 @@ endif()

if(@ENABLE_OPENSSL@)
find_dependency(OpenSSL)
select_library_configurations_from_targets(BASENAME SSL TARGETS OpenSSL::SSL OpenSSL::Crypto)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${SSL_LIBRARIES})
if(WIN32 AND NOT CYGWIN)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS Crypt32)
endif()
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${OPENSSL_LIBRARIES})
endif()

if(@ENABLE_OPUS@)
Expand Down
1 change: 1 addition & 0 deletions ports/openssl-windows/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: openssl-windows
Version: 1.1.1h
Port-Version: 1
Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
Supports: windows
4 changes: 4 additions & 0 deletions ports/openssl-windows/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,7 @@ vcpkg_copy_pdbs()

file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)
endif()
12 changes: 12 additions & 0 deletions ports/openssl-windows/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
_find_package(${ARGS})

# workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/19263
list(APPEND OPENSSL_LIBRARIES crypt32 ws2_32)
set_property(TARGET OpenSSL::SSL
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES
crypt32 ws2_32)
set_property(TARGET OpenSSL::Crypto
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES
crypt32 ws2_32)
1 change: 1 addition & 0 deletions ports/xeus/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: xeus
Version: 0.24.1
Port-Version: 1
Homepage: https://github.com/jupyter-xeus/xeus
Description: C++ implementation of the Jupyter kernel protocol
Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
16 changes: 0 additions & 16 deletions ports/xeus/Fix-static-build.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ports/xeus/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
Fix-Compile-nlohmann-json.patch
Fix-static-build.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
Expand Down