From a143cc4fcfe3c6aea34bc3151339f2297c1d13a7 Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 1 Feb 2020 20:49:49 -0500 Subject: [PATCH] bundle openssl... --- CMakeLists.txt | 6 +++--- scripts/get_static_libs.sh | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79c1fc9..17ea388 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,8 +89,6 @@ target_compile_options(sist2 -fomit-frame-pointer ) -target_link_directories(sist2 PRIVATE /usr/local/lib) - TARGET_LINK_LIBRARIES( sist2 @@ -135,7 +133,9 @@ TARGET_LINK_LIBRARIES( # curl ${PROJECT_SOURCE_DIR}/lib/libcurl.a - ssl crypto + ${PROJECT_SOURCE_DIR}/lib/libcrypto.a + ${PROJECT_SOURCE_DIR}/lib/libssl.a + dl ) add_custom_target( diff --git a/scripts/get_static_libs.sh b/scripts/get_static_libs.sh index d8603d3..1ec5d2d 100755 --- a/scripts/get_static_libs.sh +++ b/scripts/get_static_libs.sh @@ -106,13 +106,23 @@ make -j $THREADS cd .. mv libpng/.libs/libpng16.a . +# openssl... +git clone --depth 1 -b OpenSSL_1_1_0-stable https://github.com/openssl/openssl +cd openssl +./config --prefix=$(pwd)/../ssl +make depend +make -j $THREADS +make install +cd .. +mv ./openssl/libcrypto.a ./openssl/libssl.a . + # curl wget -nc https://curl.haxx.se/download/curl-7.68.0.tar.gz tar -xzf curl-7.68.0.tar.gz cd curl-7.68.0 ./configure --disable-ldap --disable-ldaps --without-librtmp --disable-rtsp --disable-crypto-auth \ --disable-smtp --without-libidn2 --without-nghttp2 --without-brotli --enable-static --disable-shared \ - --without-libpsl + --without-libpsl --with-ssl=$(pwd)/../ssl make -j $THREADS cd .. mv curl-7.68.0/lib/.libs/libcurl.a .