diff options
| author | Liu Chenxin <chenxinleo@163.com> | 2021-09-04 13:36:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-03 22:36:23 -0700 |
| commit | 210240b399fbc2f1363f4103b6a93629c207d7e3 (patch) | |
| tree | 248fb8c53f64f6790cc6148914487566e4c43a06 /ports/libssh | |
| parent | 09019cbc9abcb728217c4c99625932defe1b781c (diff) | |
| download | vcpkg-210240b399fbc2f1363f4103b6a93629c207d7e3.tar.gz vcpkg-210240b399fbc2f1363f4103b6a93629c207d7e3.zip | |
[libssh] add static build support for MinGW subsystem (#19854)
* add MinGW subsystem support for nana
* update port version
* [nana] update versions
* format-manifest
* add static build support for MingW subsystem
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Diffstat (limited to 'ports/libssh')
| -rw-r--r-- | ports/libssh/0002-mingw_for_Android.patch | 12 | ||||
| -rw-r--r-- | ports/libssh/0003-create_symlink_unix_only.patch | 16 | ||||
| -rw-r--r-- | ports/libssh/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libssh/portfile.cmake | 1 |
4 files changed, 26 insertions, 5 deletions
diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch index e0e3472b1..973f6eafa 100644 --- a/ports/libssh/0002-mingw_for_Android.patch +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -1,12 +1,16 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt (revision 0cceefd49d4d397eb21bd36e314ac87739da51ff) -+++ b/src/CMakeLists.txt (date 1617870624653) -@@ -361,7 +361,7 @@ +index ccf5a33..8e88494 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -361,9 +361,9 @@ if (WITH_VISIBILITY_HIDDEN) set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") endif (WITH_VISIBILITY_HIDDEN) -if (MINGW) +if (MINGW AND NOT ANDROID) set_target_properties(ssh PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup") - set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") +- set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") ++ set_property(TARGET ssh APPEND PROPERTY COMPILE_FLAGS "-D_POSIX_SOURCE") endif () + + diff --git a/ports/libssh/0003-create_symlink_unix_only.patch b/ports/libssh/0003-create_symlink_unix_only.patch new file mode 100644 index 000000000..140d7e1c8 --- /dev/null +++ b/ports/libssh/0003-create_symlink_unix_only.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1f5b0bf..6559468 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,9 +206,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET}) + + # Link compile database for clangd ++if(UNIX) + execute_process(COMMAND cmake -E create_symlink + "${CMAKE_BINARY_DIR}/compile_commands.json" + "${CMAKE_SOURCE_DIR}/compile_commands.json") ++endif() + + message(STATUS "********************************************") + message(STATUS "********** ${PROJECT_NAME} build options : **********") diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index 5f7ee61c1..cec23294e 100644 --- a/ports/libssh/CONTROL +++ b/ports/libssh/CONTROL @@ -1,6 +1,6 @@ Source: libssh Version: 0.9.5 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.libssh.org/ Build-Depends: libssh[core,mbedtls] (android) Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index f9a430129..c15cc0a9c 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_git( PATCHES 0001-export-pkgconfig-file.patch 0002-mingw_for_Android.patch + 0003-create_symlink_unix_only.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS |