Bug#24947136 ENABLE DEVELOPERSTUDIO12.5 WITH C++03 FOR MYSQL 5.7

This patch adds support for building mysql5.7 server (including NDB)
with -std=c++03

cmake/os/SunOS.cmake partial backport of
Bug#24481181: RAISE MINIMUM CMAKE VERSION TO 2.8.12

configure.cmake partial backport of
Bug#24487934 FIX DYNAMIC LIBRARY SEARCH PATHS ISSUES ON SOLARIS

Author: Tor Didriksen

CMakeLists.txt

@@ -733,6 +733,8 @@ GET_PROPERTY(cwd_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
 MESSAGE(STATUS "COMPILE_DEFINITIONS: ${cwd_definitions}")
 MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
 MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+MESSAGE(STATUS "CMAKE_C_LINK_FLAGS: ${CMAKE_C_LINK_FLAGS}")
+MESSAGE(STATUS "CMAKE_CXX_LINK_FLAGS: ${CMAKE_CXX_LINK_FLAGS}")
 IF(CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Makefiles")
   STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
   MESSAGE(STATUS "CMAKE_C_FLAGS_${CMAKEBT}: ${CMAKE_C_FLAGS_${CMAKEBT}}")

cmake/os/SunOS.cmake

@@ -73,6 +73,16 @@ IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
     MESSAGE("Adding -m${ISAINFO_B}")
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m${ISAINFO_B}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${ISAINFO_B}")
+    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -m${ISAINFO_B}")
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m${ISAINFO_B}")
+  ENDIF()
+ELSE()
+  IF("${CMAKE_C_FLAGS}" MATCHES "-m32")
+    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -m32")
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m32")
+  ELSE()
+    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -m64")
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64")
   ENDIF()
 ENDIF()
 

configure.cmake

@@ -75,12 +75,7 @@ ENDIF()
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
   IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
     IF(CMAKE_CXX_FLAGS MATCHES "-std=")
-      ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION)
-      SET(CMAKE_SHARED_LIBRARY_C_FLAGS
-        "${CMAKE_SHARED_LIBRARY_C_FLAGS} -lc")
-      SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS
-        "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc")
-      SET(QUOTED_CMAKE_CXX_LINK_FLAGS "-lstdc++ -lgcc_s -lCrunG3 -lc")
+      # Nothing here, handled separately below
     ELSE()
       IF(SUNPRO_CXX_LIBRARY)
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}")
@@ -130,15 +125,13 @@ MACRO(EXTEND_CXX_LINK_FLAGS LIBRARY_PATH)
   # on a path relative to the executable:
   # We need an extra backslash to pass $ORIGIN to the mysql_config script...
   SET(QUOTED_CMAKE_CXX_LINK_FLAGS
-    "${CMAKE_CXX_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${LIBRARY_PATH}")
+    "${CMAKE_CXX_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${LIBRARY_PATH} ")
   SET(CMAKE_CXX_LINK_FLAGS
     "${CMAKE_CXX_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
   MESSAGE(STATUS "CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS}")
 ENDMACRO()
 
 MACRO(EXTEND_C_LINK_FLAGS LIBRARY_PATH)
-  SET(QUOTED_CMAKE_C_LINK_FLAGS
-    "${CMAKE_C_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${LIBRARY_PATH}")
   SET(CMAKE_C_LINK_FLAGS
     "${CMAKE_C_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
   MESSAGE(STATUS "CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS}")
@@ -195,6 +188,43 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC)
   ENDIF()
 ENDIF()
 
+
+# We assume that developer studio runtime libraries are installed.
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
+   CMAKE_CXX_COMPILER_ID STREQUAL "SunPro" AND
+   CMAKE_CXX_FLAGS MATCHES "-std=c")
+  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
+
+  SET(LIBRARY_SUFFIX "lib/compilers/CC-gcc/lib")
+  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/sparcv9")
+  ENDIF()
+  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/amd64")
+  ENDIF()
+  FIND_LIBRARY(STL_LIBRARY_NAME
+    NAMES "stdc++"
+    PATHS ${CXX_PATH}/../${LIBRARY_SUFFIX}
+    NO_DEFAULT_PATH
+  )
+  MESSAGE(STATUS "STL_LIBRARY_NAME ${STL_LIBRARY_NAME}")
+  IF(STL_LIBRARY_NAME)
+    DIRNAME(${STL_LIBRARY_NAME} STL_LIBRARY_PATH)
+    SET(QUOTED_CMAKE_CXX_LINK_FLAGS
+      "${CMAKE_CXX_LINK_FLAGS} -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
+    SET(CMAKE_CXX_LINK_FLAGS
+      "${CMAKE_CXX_LINK_FLAGS} -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
+    SET(CMAKE_C_LINK_FLAGS
+      "${CMAKE_C_LINK_FLAGS} -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
+  ENDIF()
+  SET(CMAKE_C_LINK_FLAGS
+    "${CMAKE_C_LINK_FLAGS} -lc")
+  SET(CMAKE_CXX_LINK_FLAGS
+    "${CMAKE_CXX_LINK_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc")
+  SET(QUOTED_CMAKE_CXX_LINK_FLAGS
+    "${QUOTED_CMAKE_CXX_LINK_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc ")
+ENDIF()
+
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
    CMAKE_C_COMPILER_ID MATCHES "SunPro" AND
    CMAKE_CXX_FLAGS MATCHES "stlport4")

scripts/CMakeLists.txt

@@ -232,6 +232,12 @@ FOREACH(option ${REPLACE_REGEX_OPTIONS})
   STRING(REGEX REPLACE "${option}" "" CXXFLAGS "${CXXFLAGS}")
 ENDFOREACH()
 
+# Do not remove -std=c++11 for Solaris Studio as it is required to get
+# the correct libraries. Only remove for GCC/Clang
+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  STRING(REGEX REPLACE "-std=c..[0-9]+" "" CXXFLAGS "${CXXFLAGS}")
+ENDIF()
+
 FOREACH(option ${REPLACE_OPTIONS})
   STRING(REPLACE "${option}" " " CFLAGS   "${CFLAGS}")
   STRING(REPLACE "${option}" " " CXXFLAGS "${CXXFLAGS}")
@@ -387,14 +393,7 @@ IF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
 SET(CONFIG_CLIENT_LIBS "${CLIENT_LIBS}")
-IF(QUOTED_CMAKE_C_LINK_FLAGS)
-  SET(CONFIG_CLIENT_LIBS "${CONFIG_CLIENT_LIBS} ${QUOTED_CMAKE_C_LINK_FLAGS}")
-ENDIF()
-
 SET(CONFIG_EMBEDD_LIBS "${EMBEDD_LIBS}")
-IF(QUOTED_CMAKE_CXX_LINK_FLAGS)
-  SET(CONFIG_EMBEDD_LIBS "${CONFIG_EMBEDD_LIBS} ${QUOTED_CMAKE_CXX_LINK_FLAGS}")
-ENDIF()
 
 SET(LIBMYSQLD_LIBS_USAGE "
         --libmysqld-libs [$embedded_libs]")

scripts/mysql_config.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2000, 2015, 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
@@ -110,9 +110,9 @@ else
 fi
 
 # Create options 
-libs="-L$pkglibdir@RPATH_OPTION@"
+libs="@QUOTED_CMAKE_CXX_LINK_FLAGS@-L$pkglibdir@RPATH_OPTION@"
 libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@"
-embedded_libs="-L$pkglibdir@RPATH_OPTION@"
+embedded_libs="@QUOTED_CMAKE_CXX_LINK_FLAGS@-L$pkglibdir@RPATH_OPTION@"
 embedded_libs="$embedded_libs -l@LIBEMBED_OS_OUTPUT_NAME@ @CONFIG_EMBEDD_LIBS@"
 
 cflags="-I$pkgincludedir @CFLAGS@"
@@ -123,6 +123,7 @@ include="-I$pkgincludedir"
 usage () {
         cat <<EOF
 Usage: $0 [OPTIONS]
+Compiler: @COMPILER_ID_AND_VERSION@
 Options:
         --cflags         [$cflags]
         --cxxflags       [$cxxflags]

storage/ndb/src/ndbapi/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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