Commit 5f8effe1 authored by Sergey Vojtovich's avatar Sergey Vojtovich

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.
parent b07d0e2a
...@@ -142,7 +142,9 @@ MACRO (MYSQL_CHECK_SSL) ...@@ -142,7 +142,9 @@ MACRO (MYSQL_CHECK_SSL)
# On mac this list is <.dylib;.so;.a> # On mac this list is <.dylib;.so;.a>
# We prefer static libraries, so we revert it here. # 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}>") MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
FIND_LIBRARY(OPENSSL_LIBRARIES FIND_LIBRARY(OPENSSL_LIBRARIES
NAMES ssl ssleay32 ssleay32MD NAMES ssl ssleay32 ssleay32MD
...@@ -150,7 +152,9 @@ MACRO (MYSQL_CHECK_SSL) ...@@ -150,7 +152,9 @@ MACRO (MYSQL_CHECK_SSL)
FIND_LIBRARY(CRYPTO_LIBRARY FIND_LIBRARY(CRYPTO_LIBRARY
NAMES crypto libeay32 NAMES crypto libeay32
HINTS ${OPENSSL_ROOT_DIR}/lib) 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: # Verify version number. Version information looks like:
# #define OPENSSL_VERSION_NUMBER 0x1000103fL # #define OPENSSL_VERSION_NUMBER 0x1000103fL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment