From 6e3fe7fbc8136874e6718e0ebf649b6d79dd21d3 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 12 Feb 2022 21:30:33 -0800 Subject: [PATCH] Minor bug fixes to library staging. --- CMakeLists.txt | 2 -- script/archive-standalone-nix.sh | 1 + script/stage-vendor-libraries.sh | 5 +++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4594bb418..8decbd405 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,8 +54,6 @@ else() find_library(LIBCRYPTO NAMES crypto) endif() -find_library(LIBSSL NAMES ssl PATHS ${VENDOR_LINK_DIRECTORIES}) -find_library(LIBCRYPTO NAMES crypto PATHS ${VENDOR_LINK_DIRECTORIES}) find_library(LIBZ NAMES z) set(musikcube_LINK_LIBS ${DEFAULT_OS_SYSTEM_LIBS} ${Boost_LIBRARIES} ${LIBCURL} ${LIBSSL} ${LIBCRYPTO} ${LIBZ}) diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh index 40de45873..5835039e3 100755 --- a/script/archive-standalone-nix.sh +++ b/script/archive-standalone-nix.sh @@ -38,6 +38,7 @@ printf "\n" read -p ' clean and rebuild [y]? ' CLEAN if [[ $CLEAN == 'n' || $CLEAN == 'N' ]]; then printf "\n\n\n ***** SKIPPING REBUILD *****\n\n\n" + ./script/stage-vendor-libraries.sh || exit $? sleep 3 else printf "\n\n\n ***** REBUILDING NOW *****\n\n\n" diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index d6ae63c41..ca40de6b8 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -35,6 +35,11 @@ if [[ "$PLATFORM" == 'Darwin' ]]; then cp vendor/libmicrohttpd-bin/lib/libmicrohttpd.dylib ./bin/lib + cd bin/lib/ + ln -s libcrypto.dylib libcrypto.1.1.dylib + ln -s libssl.dylib libssl.1.1.dylib + cd ../../ + elif [[ "$PLATFORM" == 'Linux' ]]; then echo "[stage-static-vendor-libraries] staging Linux .so files..."