From a4c804b7058df9482afb7178c2a9dbda6c2f6b78 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 20 Aug 2022 16:34:40 +0200 Subject: [PATCH] Properly work around colliding symbol --- scripts.d/50-libssh.sh | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index c4a1836..51dbf75 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -13,26 +13,22 @@ ffbuild_dockerbuild() { mkdir build && cd build - cmake \ - -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ + if [[ $TARGET == win* ]]; then + export CFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday" + export CXXFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday" + fi + + cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ -DBUILD_SHARED_LIBS=OFF \ - -DWITH_BLOWFISH_CIPHER=ON \ - -DWITH_DSA=ON \ - -DWITH_PCAP=ON \ - -DWITH_SFTP=ON \ - -DWITH_ZLIB=ON \ - -DWITH_EXAMPLES=OFF \ - -DWITH_SERVER=OFF \ - -GNinja \ - .. + -DWITH_EXAMPLES=OFF -DWITH_SERVER=OFF \ + -DWITH_SFTP=ON -DWITH_ZLIB=ON .. + ninja -j$(nproc) ninja install { echo "Requires.private: libssl libcrypto zlib" - echo "Cflags.private: -DLIBSSH_STATIC" + echo "Cflags.private: -DLIBSSH_STATIC" } >> "$FFBUILD_PREFIX"/lib/pkgconfig/libssh.pc } @@ -43,7 +39,3 @@ ffbuild_configure() { ffbuild_unconfigure() { echo --disable-libssh } - -ffbuild_ldflags() { - echo -Wl,--allow-multiple-definition -}