Bug#16200717 WRONG OUTPUT FROM MYSQL_CONFIG --LIBS

Output from 'mysql_config --libs' included:
-lpthread -lprobes_mysql -lm -lrt -lssl -lcrypto -ldl

For some build configurations, we merge ssl libraries into the client libs.
For these builds, -lssl and -lcrypto should not be mentioned.
The 'probes_mysql' should also go away (there is no such library)

Author: Tor Didriksen

cmake/create_initial_db.cmake.in

@@ -21,7 +21,7 @@ SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
 
 SET(WITH_SSL_PATH "@WITH_SSL_PATH@")
 SET(CRYPTO_LIBRARY "@CRYPTO_LIBRARY@")
-SET(OPENSSL_LIBRARY "@OPENSSL_LIBRARIES@")
+SET(OPENSSL_LIBRARY "@OPENSSL_LIBRARY@")
 
 SET(WIN32 "@WIN32@")
 

cmake/dtrace.cmake

@@ -74,13 +74,6 @@ IF(ENABLE_DTRACE)
    ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h
    ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h
   )
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-   # Systemtap object
-   EXECUTE_PROCESS(
-     COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
-     -o ${CMAKE_BINARY_DIR}/probes_mysql.o
-   )
-  ENDIF()
   ADD_CUSTOM_TARGET(gen_dtrace_header
   DEPENDS  
   ${CMAKE_BINARY_DIR}/include/probes_mysql.d
@@ -99,12 +92,7 @@ FUNCTION(DTRACE_INSTRUMENT target)
   IF(ENABLE_DTRACE)
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 
-    IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-      TARGET_LINK_LIBRARIES(${target}  ${CMAKE_BINARY_DIR}/probes_mysql.o)
-    ENDIF()
-
-    # On Solaris, invoke dtrace -G to generate object file and
-    # link it together with target.
+    # Invoke dtrace to generate object file and link it together with target.
     IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
       SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
       SET(outfile ${objdir}/${target}_dtrace.o)
@@ -121,24 +109,32 @@ FUNCTION(DTRACE_INSTRUMENT target)
           -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
         WORKING_DIRECTORY ${objdir}
       )
-      # Add full  object path to linker flags
-      GET_TARGET_PROPERTY(target_type ${target} TYPE)
-      IF(NOT target_type MATCHES "STATIC")
-        SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}")
-      ELSE()
-        # For static library flags, add the object to the library.
-        # Note: DTrace probes in static libraries are  unusable currently 
-        # (see explanation for DTRACE_INSTRUMENT_STATIC_LIBS below)
-        # but maybe one day this will be fixed.
-        GET_TARGET_PROPERTY(target_location ${target} LOCATION)
-        ADD_CUSTOM_COMMAND(
-         TARGET ${target} POST_BUILD
-         COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
-	 COMMAND ${CMAKE_RANLIB} ${target_location}
+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+      SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
+      # Systemtap object
+      EXECUTE_PROCESS(
+        COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
+        -o ${outfile}
+        )
+    ENDIF()
+
+    # Add full  object path to linker flags
+    GET_TARGET_PROPERTY(target_type ${target} TYPE)
+    IF(NOT target_type MATCHES "STATIC")
+      SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}")
+    ELSE()
+      # For static library flags, add the object to the library.
+      # Note: DTrace probes in static libraries are  unusable currently 
+      # (see explanation for DTRACE_INSTRUMENT_STATIC_LIBS below)
+      # but maybe one day this will be fixed.
+      GET_TARGET_PROPERTY(target_location ${target} LOCATION)
+      ADD_CUSTOM_COMMAND(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
+	COMMAND ${CMAKE_RANLIB} ${target_location}
         )
-       # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
-       SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
-      ENDIF()
+      # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
+      SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
     ENDIF()
   ENDIF()
 ENDFUNCTION()

cmake/libutils.cmake

@@ -126,7 +126,7 @@ ENDMACRO()
 
 MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
   # To produce a library we need at least one source file.
-  # It is created by ADD_CUSTOM_COMMAND below and will helps 
+  # It is created by ADD_CUSTOM_COMMAND below and will
   # also help to track dependencies.
   SET(SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_depends.c)
   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
@@ -158,6 +158,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
   IF(OSLIBS)
     LIST(REMOVE_DUPLICATES OSLIBS)
     TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
+    MESSAGE(STATUS "Library ${TARGET} depends on OSLIBS ${OSLIBS}")
   ENDIF()
 
   # Make the generated dummy source file depended on all static input

cmake/ssl.cmake

@@ -105,9 +105,13 @@ MACRO (MYSQL_CHECK_SSL)
       UNSET(OPENSSL_APPLINK_C)
       UNSET(OPENSSL_APPLINK_C CACHE)
     ENDIF()
-    IF (OPENSSL_LIBRARIES)
-      UNSET(OPENSSL_LIBRARIES)
-      UNSET(OPENSSL_LIBRARIES CACHE)
+    IF (OPENSSL_LIBRARY)
+      UNSET(OPENSSL_LIBRARY)
+      UNSET(OPENSSL_LIBRARY CACHE)
+    ENDIF()
+    IF (CRYPTO_LIBRARY)
+      UNSET(CRYPTO_LIBRARY)
+      UNSET(CRYPTO_LIBRARY CACHE)
     ENDIF()
   ELSEIF(WITH_SSL STREQUAL "system" OR
          WITH_SSL STREQUAL "yes" OR
@@ -142,7 +146,7 @@ MACRO (MYSQL_CHECK_SSL)
     # We prefer static libraries, so we revert it here.
     LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
     MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
-    FIND_LIBRARY(OPENSSL_LIBRARIES
+    FIND_LIBRARY(OPENSSL_LIBRARY
                  NAMES ssl ssleay32 ssleay32MD
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
     FIND_LIBRARY(CRYPTO_LIBRARY
@@ -163,7 +167,7 @@ MACRO (MYSQL_CHECK_SSL)
     )
 
     IF(OPENSSL_INCLUDE_DIR AND
-       OPENSSL_LIBRARIES   AND
+       OPENSSL_LIBRARY   AND
        CRYPTO_LIBRARY      AND
        OPENSSL_MAJOR_VERSION STREQUAL "1"
       )
@@ -172,8 +176,32 @@ MACRO (MYSQL_CHECK_SSL)
       SET(OPENSSL_FOUND FALSE)
     ENDIF()
 
+    # If we are invoked with -DWITH_SSL=/path/to/custom/openssl
+    # and we have found static libraries, then link them statically
+    # into our executables and libraries.
+    # Adding IMPORTED_LOCATION allows MERGE_STATIC_LIBS
+    # to get LOCATION and do correct dependency analysis.
+    SET(MY_CRYPTO_LIBRARY "${CRYPTO_LIBRARY}")
+    SET(MY_OPENSSL_LIBRARY "${OPENSSL_LIBRARY}")
+    IF (WITH_SSL_PATH)
+      GET_FILENAME_COMPONENT(CRYPTO_EXT "${CRYPTO_LIBRARY}" EXT)
+      GET_FILENAME_COMPONENT(OPENSSL_EXT "${OPENSSL_LIBRARY}" EXT)
+      IF (CRYPTO_EXT STREQUAL ".a")
+        SET(MY_CRYPTO_LIBRARY imported_crypto)
+        ADD_LIBRARY(imported_crypto STATIC IMPORTED)
+        SET_TARGET_PROPERTIES(imported_crypto
+          PROPERTIES IMPORTED_LOCATION "${CRYPTO_LIBRARY}")
+      ENDIF()
+      IF (OPENSSL_EXT STREQUAL ".a")
+        SET(MY_OPENSSL_LIBRARY imported_openssl)
+        ADD_LIBRARY(imported_openssl STATIC IMPORTED)
+        SET_TARGET_PROPERTIES(imported_openssl
+          PROPERTIES IMPORTED_LOCATION "${OPENSSL_LIBRARY}")
+      ENDIF()
+    ENDIF()
+
     MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
-    MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
+    MESSAGE(STATUS "OPENSSL_LIBRARY = ${OPENSSL_LIBRARY}")
     MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}")
     MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}")
 
@@ -183,7 +211,7 @@ MACRO (MYSQL_CHECK_SSL)
                         HAVE_SHA512_DIGEST_LENGTH)
     IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH)
       SET(SSL_SOURCES "")
-      SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY})
+      SET(SSL_LIBRARIES ${MY_OPENSSL_LIBRARY} ${MY_CRYPTO_LIBRARY})
       IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
         SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
       ENDIF()
@@ -216,7 +244,7 @@ ENDMACRO()
 MACRO (COPY_OPENSSL_DLLS target_name)
   IF (WIN32 AND WITH_SSL_PATH)
     GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
-    GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARIES}" NAME_WE)
+    GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARY}" NAME_WE)
     FILE(GLOB HAVE_CRYPTO_DLL "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll")
     FILE(GLOB HAVE_OPENSSL_DLL "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll")
     IF (HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL)

libmysql/CMakeLists.txt

@@ -173,7 +173,6 @@ IF(WIN32)
 ENDIF()
 
 # Merge several convenience libraries into one big mysqlclient
-# and link them together into shared library.
 MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
@@ -197,7 +196,11 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT DISABLE_SHARED)
-  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
+  # Merge several convenience libraries into one big mysqlclient
+  # and link them together into shared library.
+  MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+    EXPORTS ${CLIENT_API_FUNCTIONS}
+    COMPONENT SharedLibraries)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)