From 5f8effe1db11c55c17df96b14993a73fe1f045ec Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Sat, 27 Jul 2013 17:04:57 +0400 Subject: [PATCH] MDEV-4786 - merge 10.0-monty - 10.0 Fixed debian/ubuntu build failure. cmake/ssl.cmake: Do not prefer static SSL libraries for WITH_SSL=system|yes as there is no guarantee that they will link well with MariaDB shared objects. Specifically on debian/ubuntu static SSL libraries are built without -fPIC. Restore 5.6 behavior. 10.0.3 never prefer static SSL libraries. --- cmake/ssl.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 18ace717965..365494077dc 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -142,7 +142,9 @@ MACRO (MYSQL_CHECK_SSL) # On mac this list is <.dylib;.so;.a> # We prefer static libraries, so we revert it here. - LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) + IF (WITH_SSL_PATH) + LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) + ENDIF() MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>") FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD @@ -150,7 +152,9 @@ MACRO (MYSQL_CHECK_SSL) FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto libeay32 HINTS ${OPENSSL_ROOT_DIR}/lib) - LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) + IF (WITH_SSL_PATH) + LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) + ENDIF() # Verify version number. Version information looks like: # #define OPENSSL_VERSION_NUMBER 0x1000103fL