cmake-2.6.0.diff

   1 diff -uraN cmake-2.6.0.orig/debian/patches/kfreebsd-kopensolaris-Platform.diff cmake-2.6.0/debian/patches/kfreebsd-kopensolaris-Platform.diff
   2 --- cmake-2.6.0.orig/debian/patches/kfreebsd-kopensolaris-Platform.diff 1969-12-31 19:00:00.000000000 -0500
   3 +++ cmake-2.6.0/debian/patches/kfreebsd-kopensolaris-Platform.diff      2008-09-27 23:12:47.855460201 -0400
   4 @@ -0,0 +1,92 @@
   5 +--- a/Modules/CMakeDetermineSystem.cmake
   6 ++++ b/Modules/CMakeDetermineSystem.cmake
   7 +@@ -12,6 +12,8 @@
   8 + # HP-UX                         HP-UX
   9 + # IRIX                          IRIX
  10 + # Linux                         Linux
  11 ++# GNU/kFreeBSD                  GNU/kFreeBSD
  12 ++# GNU/kOpenSolaris              GNU/kOpenSolaris
  13 + # NetBSD                        NetBSD
  14 + # OpenBSD                       OpenBSD
  15 + # OFS/1 (Digital Unix)          OSF1
  16 +@@ -108,6 +110,16 @@
  17 +     SET(${_PREFIX}_NAME BSDOS)
  18 +   ENDIF(${_PREFIX}_NAME MATCHES BSD.OS)
  19 +
  20 ++  # fix for GNU/kFreeBSD , remove the GNU/
  21 ++  IF(CMAKE_SYSTEM_NAME MATCHES GNU.kFreeBSD)
  22 ++    SET(CMAKE_SYSTEM_NAME kFreeBSD)
  23 ++  ENDIF(CMAKE_SYSTEM_NAME MATCHES GNU.kFreeBSD)
  24 ++
  25 ++  # fix for GNU/kOpenSolaris , remove the GNU/
  26 ++  IF(CMAKE_SYSTEM_NAME MATCHES GNU.kOpenSolaris)
  27 ++    SET(CMAKE_SYSTEM_NAME kOpenSolaris)
  28 ++  ENDIF(CMAKE_SYSTEM_NAME MATCHES GNU.kOpenSolaris)
  29 ++
  30 +   # fix for CYGWIN which has windows version in it
  31 +   IF(${_PREFIX}_NAME MATCHES CYGWIN)
  32 +     SET(${_PREFIX}_NAME CYGWIN)
  33 +--- /dev/null
  34 ++++ b/Modules/Platform/kOpenSolaris.cmake
  35 +@@ -0,0 +1,61 @@
  36 ++# GCC is the default compiler on Linux.
  37 ++SET(CMAKE_DL_LIBS "dl")
  38 ++SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
  39 ++SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
  40 ++SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
  41 ++SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
  42 ++SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
  43 ++SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
  44 ++SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
  45 ++SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
  46 ++SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
  47 ++SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
  48 ++SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
  49 ++
  50 ++# Shared libraries with no builtin soname may not be linked safely by
  51 ++# specifying the file path.
  52 ++SET(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
  53 ++
  54 ++# Initialize C link type selection flags.  These flags are used when
  55 ++# building a shared library, shared module, or executable that links
  56 ++# to other libraries to select whether to use the static or shared
  57 ++# versions of the libraries.
  58 ++FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
  59 ++  SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
  60 ++  SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
  61 ++ENDFOREACH(type)
  62 ++
  63 ++# Debian policy requires that shared libraries be installed without
  64 ++# executable permission.  Fedora policy requires that shared libraries
  65 ++# be installed with the executable permission.  Since the native tools
  66 ++# create shared libraries with execute permission in the first place a
  67 ++# reasonable policy seems to be to install with execute permission by
  68 ++# default.  In order to support debian packages we provide an option
  69 ++# here.  The option default is based on the current distribution, but
  70 ++# packagers can set it explicitly on the command line.
  71 ++IF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
  72 ++  # Store the decision variable in the cache.  This preserves any
  73 ++  # setting the user provides on the command line.
  74 ++  SET(CMAKE_INSTALL_SO_NO_EXE "${CMAKE_INSTALL_SO_NO_EXE}" CACHE INTERNAL
  75 ++    "Install .so files without execute permission.")
  76 ++ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
  77 ++  # Store the decision variable as an internal cache entry to avoid
  78 ++  # checking the platform every time.  This option is advanced enough
  79 ++  # that only package maintainers should need to adjust it.  They are
  80 ++  # capable of providing a setting on the command line.
  81 ++  IF(EXISTS "/etc/debian_version")
  82 ++    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
  83 ++      "Install .so files without execute permission.")
  84 ++  ELSE(EXISTS "/etc/debian_version")
  85 ++    SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
  86 ++      "Install .so files without execute permission.")
  87 ++  ENDIF(EXISTS "/etc/debian_version")
  88 ++ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
  89 ++
  90 ++INCLUDE(Platform/UnixPaths)
  91 ++
  92 ++# Debian has lib64 paths only for compatibility so they should not be
  93 ++# searched.
  94 ++IF(EXISTS "/etc/debian_version")
  95 ++  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
  96 ++ENDIF(EXISTS "/etc/debian_version")
  97 diff -uraN cmake-2.6.0.orig/debian/patches/kfreebsd-Platform.diff cmake-2.6.0/debian/patches/kfreebsd-Platform.diff
  98 --- cmake-2.6.0.orig/debian/patches/kfreebsd-Platform.diff      2008-09-27 23:04:09.000000000 -0400
  99 +++ cmake-2.6.0/debian/patches/kfreebsd-Platform.diff   1969-12-31 19:00:00.000000000 -0500
 100 @@ -1,22 +0,0 @@
 101 ---- cmake-2.6.0-RC-8.orig/Modules/CMakeDetermineSystem.cmake
 102 -+++ cmake-2.6.0-RC-8/Modules/CMakeDetermineSystem.cmake
 103 -@@ -12,6 +12,7 @@
 104 - # HP-UX                         HP-UX
 105 - # IRIX                          IRIX
 106 - # Linux                         Linux
 107 -+# GNU/kFreeBSD                  GNU/kFreeBSD
 108 - # NetBSD                        NetBSD
 109 - # OpenBSD                       OpenBSD
 110 - # OFS/1 (Digital Unix)          OSF1
 111 -@@ -108,6 +109,11 @@
 112 -     SET(${_PREFIX}_NAME BSDOS)
 113 -   ENDIF(${_PREFIX}_NAME MATCHES BSD.OS)
 114 -
 115 -+  # fix for GNU/kFreeBSD , remove the GNU/
 116 -+  IF(CMAKE_SYSTEM_NAME MATCHES GNU.kFreeBSD)
 117 -+    SET(CMAKE_SYSTEM_NAME kFreeBSD)
 118 -+  ENDIF(CMAKE_SYSTEM_NAME MATCHES GNU.kFreeBSD)
 119 -+
 120 -   # fix for CYGWIN which has windows version in it
 121 -   IF(${_PREFIX}_NAME MATCHES CYGWIN)
 122 -     SET(${_PREFIX}_NAME CYGWIN)
 123 diff -uraN cmake-2.6.0.orig/debian/patches/series cmake-2.6.0/debian/patches/series
 124 --- cmake-2.6.0.orig/debian/patches/series      2008-09-27 23:04:09.000000000 -0400
 125 +++ cmake-2.6.0/debian/patches/series   2008-09-27 23:08:14.968469082 -0400
 126 @@ -1,6 +1,6 @@
 127  FindQt4.cmake2.6.diff
 128  do-not-use-lib64.diff
 129  findmpeg2-addpath.diff
 130 -kfreebsd-Platform.diff
 131 +kfreebsd-kopensolaris-Platform.diff
 132  executables-dont-need-fpic.diff
 133  reinstate-arm.diff
 134 diff -uraN cmake-2.6.0.orig/.pc/.version cmake-2.6.0/.pc/.version
 135 --- cmake-2.6.0.orig/.pc/.version       1969-12-31 19:00:00.000000000 -0500
 136 +++ cmake-2.6.0/.pc/.version    2008-09-27 23:10:10.542462886 -0400
 137 @@ -0,0 +1 @@
 138 +2