From 5efdf68740f33968022ff9853f71dbc66cc97345 Mon Sep 17 00:00:00 2001 From: Lawrin Novitsky Date: Tue, 9 Jun 2020 15:17:37 +0200 Subject: [PATCH] More OS X build changes Also it fixes previus "OSX build change" commit - new script had wrong permissions --- CMakeLists.txt | 2 +- osxpostbuild.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 osxpostbuild.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 510b61ce..18baa81c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,7 +321,7 @@ ELSE() ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES} maodbcu.rc) IF(APPLE) - SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "/usr/local/opt/libiodbc" "/usr/local/iODBC/lib") + SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "./" "/usr/local/opt/libiodbc" "/usr/local/iODBC/lib" "/usr/local/opt/openssl@1.1/lib" "/usr/local/opt/libressl/lib") SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-Wl" INSTALL_RPATH_USE_LINK_PATH 0 diff --git a/osxpostbuild.sh b/osxpostbuild.sh old mode 100644 new mode 100755 index eb02a257..c0bdb549 --- a/osxpostbuild.sh +++ b/osxpostbuild.sh @@ -23,3 +23,10 @@ echo $1 LinkedLibName=`otool -L $1 | grep -i iodbcinst | sed 's/ //' | sed 's/ [(].*$//'` echo $LinkedLibName install_name_tool -change $LinkedLibName @rpath/libiodbcinst.dylib $1 +LinkedLibName=`otool -L $1 | grep -i libssl | sed 's/ //' | sed 's/ [(].*$//'` +echo $LinkedLibName +install_name_tool -change $LinkedLibName @rpath/libssl.1.1.dylib $1 +LinkedLibName=`otool -L $1 | grep -i libcrypto | sed 's/ //' | sed 's/ [(].*$//'` +echo $LinkedLibName +install_name_tool -change $LinkedLibName @rpath/libcrypto.1.1.dylib $1 +