Bug#22504264 MYSQL COMMUNITY SERVER PACKAGE FOR SOLARIS 10 X86/AMD64 BROKEN

Tor Didriksen · Tor Didriksen · commit ffda75bc821a · 2016-01-08T14:44:47.000+01:00
Our binaries depend on libstlport, which is not part of Solaris by default,
so we ship it as part of mysql packages.

The problem was that this dependency was not noted in the client library.

Fix: bacport more from:
   Bug#16555106 FIX BROKEN BUILD WITH SOLARIS/GCC 64BIT MODE

Specifically: add -R$ORIGIN/../lib when linking the client library.
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -235,11 +235,17 @@ IF(NOT DISABLE_SHARED)
       VERSION "${OS_SHARED_LIB_VERSION}" 
       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
     CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
+
+    GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
+    IF(NOT libmysql_link_flag)
+      SET(libmysql_link_flags)
+    ENDIF()
+    SET(libmysql_link_flags
+      "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${libmysql_link_flags}")
+    SET_TARGET_PROPERTIES(libmysql
+      PROPERTIES LINK_FLAGS "${libmysql_link_flags}")
+
     IF(LINK_FLAG_NO_UNDEFINED)
-      GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
-      IF(NOT libmysql_link_flag)
-        SET(libmysql_link_flags)
-      ENDIF()
       SET(libmysql_link_flags
         "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
       SET(libmysql_link_flags
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -113,7 +113,9 @@ fi
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+libs="$libs @QUOTED_CMAKE_C_LINK_FLAGS@"
 libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+libs_r="$libs_r @QUOTED_CMAKE_C_LINK_FLAGS@"
 embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -419,6 +419,8 @@ IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
   ELSE()
     # udf_example is using safemutex exported by mysqld
     TARGET_LINK_LIBRARIES(udf_example mysqld)
+    SET_TARGET_PROPERTIES(udf_example
+      PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
   ENDIF()
 ENDIF()
 
