components/cmake/patches/02-sunos-cmake.patch
author April Chin <april.chin@oracle.com>
Wed, 11 Nov 2015 12:06:59 -0800
changeset 5081 198d4a3e4b73
permissions -rw-r--r--
21834219 update cmake to 3.3.2 22121918 enable system-test target for cmake
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5081
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     1
The first set of lines removed by this patch is committed upstream:
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     2
https://github.com/Kitware/CMake/commit/60fe4b540b40330e050dbd755204cecbc62d6a37
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     3
to fix
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     4
https://public.kitware.com/Bug/view.php?id=15673
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     5
0015673: CMAKE_C_COMPILER is used to link a CXX shared library on Solaris
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     6
and may be removed when cmake is updated to version 3.4 or later.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     7
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     8
Linking C++ libraries with the C compiler is not needed; it causes the compiler
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
     9
driver to not include libraries that need to be linked to the resulting
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    10
library (such as libstdc++ in the case of gcc).
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    11
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    12
The second set of lines removed by this patch will be submitted upstream.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    13
It removes use of historical directories which are no longer used.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    14
Any version of Studio from the last five years should automatically set
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    15
the correct paths.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    16
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    17
--- cmake-3.3.2/Modules/Platform/SunOS.cmake	Wed Sep 16 08:53:05 2015
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    18
+++ cmake-3.3.2/Modules/Platform/SunOS.cmake	Fri Oct 30 13:15:54 2015
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    19
@@ -7,22 +7,8 @@
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    20
    set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    21
 endif()
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    22
 
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    23
-if(CMAKE_COMPILER_IS_GNUCXX)
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    24
-  if(CMAKE_COMPILER_IS_GNUCC)
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    25
-    set(CMAKE_CXX_CREATE_SHARED_LIBRARY
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    26
-        "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    27
-  else()
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    28
-    # Take default rule from CMakeDefaultMakeRuleVariables.cmake.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    29
-  endif()
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    30
-endif()
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    31
 include(Platform/UnixPaths)
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    32
 
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    33
-# Add the compiler's implicit link directories.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    34
-if("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    35
-  list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    36
-    /opt/SUNWspro/lib /opt/SUNWspro/prod/lib /usr/ccs/lib)
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    37
-endif()
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    38
-
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    39
 # The Sun linker needs to find transitive shared library dependencies
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    40
 # in the -L path.
198d4a3e4b73 21834219 update cmake to 3.3.2
April Chin <april.chin@oracle.com>
parents:
diff changeset
    41
 set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)