diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2012-01-07 06:07:55 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2012-01-07 06:07:55 +0000 |
| commit | e2901940d45d4e52920f9ebdfc0806c400dcda00 (patch) | |
| tree | 5dfbe1d547b2845e2ecb58ffd13561405650ae5e /main/libssh/link-pthread.patch | |
| parent | bbcfe6f7780c9ace7c617aedcc65a6c126b576bb (diff) | |
| parent | 5c7467518a3e5e9a07977bef1112c773bcd17a9c (diff) | |
| download | aports-e2901940d45d4e52920f9ebdfc0806c400dcda00.tar.bz2 aports-e2901940d45d4e52920f9ebdfc0806c400dcda00.tar.xz | |
Merge remote-tracking branch 'alpine/master'
Conflicts:
main/rrdtool/APKBUILD
testing/nfdump/APKBUILD
Diffstat (limited to 'main/libssh/link-pthread.patch')
| -rw-r--r-- | main/libssh/link-pthread.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/main/libssh/link-pthread.patch b/main/libssh/link-pthread.patch new file mode 100644 index 0000000000..2e2c770f6a --- /dev/null +++ b/main/libssh/link-pthread.patch @@ -0,0 +1,63 @@ +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index aeff201..0191d5d 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -13,36 +13,36 @@ include_directories( + + if (LINUX) + add_executable(libssh_scp libssh_scp.c ${examples_SRCS}) +- target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(scp_download scp_download.c ${examples_SRCS}) +- target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(samplessh sample.c ${examples_SRCS}) +- target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(sshnetcat sshnetcat.c ${examples_SRCS}) +- target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY} pthread) + + if (WITH_SFTP) + add_executable(samplesftp samplesftp.c ${examples_SRCS}) +- target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY} pthread) + endif (WITH_SFTP) + + if (WITH_SERVER) + add_executable(samplesshd samplesshd.c) +- target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY} pthread) + endif (WITH_SERVER) + endif (LINUX) + + add_executable(exec exec.c ${examples_SRCS}) +-target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(senddata senddata.c ${examples_SRCS}) +-target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(libsshpp libsshpp.cpp) +-target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(libsshpp_noexcept libsshpp_noexcept.cpp) +-target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY} pthread) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e158665..ef2005d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -40,6 +40,7 @@ if (HAVE_LIBSOCKET) + set(LIBSSH_LINK_LIBRARIES + ${LIBSSH_LINK_LIBRARIES} + socket ++ pthread + ) + endif (HAVE_LIBSOCKET) + |