Properly work around colliding symbol
This commit is contained in:
parent
1724ba213a
commit
a4c804b705
1 changed files with 10 additions and 18 deletions
|
@ -13,20 +13,16 @@ ffbuild_dockerbuild() {
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
|
|
||||||
cmake \
|
if [[ $TARGET == win* ]]; then
|
||||||
-DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" \
|
export CFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
export CXXFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
|
||||||
-DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
|
fi
|
||||||
|
|
||||||
|
cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
-DWITH_BLOWFISH_CIPHER=ON \
|
-DWITH_EXAMPLES=OFF -DWITH_SERVER=OFF \
|
||||||
-DWITH_DSA=ON \
|
-DWITH_SFTP=ON -DWITH_ZLIB=ON ..
|
||||||
-DWITH_PCAP=ON \
|
|
||||||
-DWITH_SFTP=ON \
|
|
||||||
-DWITH_ZLIB=ON \
|
|
||||||
-DWITH_EXAMPLES=OFF \
|
|
||||||
-DWITH_SERVER=OFF \
|
|
||||||
-GNinja \
|
|
||||||
..
|
|
||||||
ninja -j$(nproc)
|
ninja -j$(nproc)
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
|
@ -43,7 +39,3 @@ ffbuild_configure() {
|
||||||
ffbuild_unconfigure() {
|
ffbuild_unconfigure() {
|
||||||
echo --disable-libssh
|
echo --disable-libssh
|
||||||
}
|
}
|
||||||
|
|
||||||
ffbuild_ldflags() {
|
|
||||||
echo -Wl,--allow-multiple-definition
|
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue