public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "cmake: Update to 2.8.11.2"

Browse Source 
This breaks some packages (notably liblapack) due to a broken macro
(CTEST_CUSTOM_POST_TEST). See NixOS/nixpkgs#762

This reverts commit ebc424c3abfa72464c5f6777f2d522bf6d0f3790.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-07-16 09:31:19 -04:00
parent 01294254a0
commit 0de17d6111
2 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -7,7 +7,7 @@ with stdenv.lib;
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
majorVersion = "2.8"; majorVersion = "2.8";
minorVersion = "11.2"; minorVersion = "9";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
in in
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk"; sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
}; };
patches = patches =

103
pkgs/development/tools/build-managers/cmake/search-path.patch
View File

@ -1,54 +1,53 @@
diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake cmake-2.8.11.2/Modules/Platform/Linux.cmake diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
--- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake 2013-07-02 15:41:40.000000000 +0200 --- cmake-2.8.5-orig/Modules/Platform/Linux.cmake 2011-07-08 14:21:44.000000000 +0200
+++ cmake-2.8.11.2/Modules/Platform/Linux.cmake 2013-07-15 11:43:30.557888066 +0200 +++ cmake-2.8.5/Modules/Platform/Linux.cmake 2011-07-21 19:45:00.000000000 +0200
@@ -36,13 +36,8 @@ @@ -36,13 +36,13 @@
# checking the platform every time. This option is advanced enough # checking the platform every time. This option is advanced enough
# that only package maintainers should need to adjust it. They are # that only package maintainers should need to adjust it. They are
# capable of providing a setting on the command line. # capable of providing a setting on the command line.
- if(EXISTS "/etc/debian_version") - IF(EXISTS "/etc/debian_version")
- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL - SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
- "Install .so files without execute permission.") - "Install .so files without execute permission.")
- else() - ELSE(EXISTS "/etc/debian_version")
- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + #IF(EXISTS "/etc/debian_version")
- "Install .so files without execute permission.") + # SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
- endif() + # "Install .so files without execute permission.")
+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + #ELSE(EXISTS "/etc/debian_version")
+ "Install .so files without execute permission.") SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
endif() "Install .so files without execute permission.")
- ENDIF(EXISTS "/etc/debian_version")
+ #ENDIF(EXISTS "/etc/debian_version")
ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
# Match multiarch library directory names. # Match multiarch library directory names.
@@ -50,8 +45,3 @@ @@ -52,6 +52,6 @@
include(Platform/UnixPaths) # Debian has lib64 paths only for compatibility so they should not be
# searched.
-# Debian has lib64 paths only for compatibility so they should not be -IF(EXISTS "/etc/debian_version")
-# searched. - SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-if(EXISTS "/etc/debian_version") -ENDIF(EXISTS "/etc/debian_version")
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +#IF(EXISTS "/etc/debian_version")
-endif() +# SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake +#ENDIF(EXISTS "/etc/debian_version")
--- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake 2013-07-02 15:41:40.000000000 +0200 diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
+++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake 2013-07-15 11:42:02.949204549 +0200 --- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake 2011-07-08 14:21:44.000000000 +0200
@@ -31,58 +31,13 @@ +++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake 2011-07-21 19:50:52.000000000 +0200
@@ -33,55 +33,18 @@
# List common installation prefixes. These will be used for all
# search types. # search types.
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard # Standard
- /usr/local /usr / - /usr/local /usr /
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@") -
- # CMake install location - # CMake install location
- "${_CMAKE_INSTALL_DIR}" - "${_CMAKE_INSTALL_DIR}"
+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib") -
- # Project install destination. - # Project install destination.
- "${CMAKE_INSTALL_PREFIX}" - "${CMAKE_INSTALL_PREFIX}"
- ) - )
+list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include") -
-# List common include file locations not under the common prefixes. -# List common include file locations not under the common prefixes.
-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
- # Windows API on Cygwin - # Windows API on Cygwin
- /usr/include/w32api - /usr/include/w32api
- -
@ -57,11 +56,11 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.
- -
- # Other - # Other
- /usr/pkg/include - /usr/pkg/include
- /opt/csw/include /opt/include - /opt/csw/include /opt/include
- /usr/openwin/include - /usr/openwin/include
- ) - )
- -
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
- # Windows API on Cygwin - # Windows API on Cygwin
- /usr/lib/w32api - /usr/lib/w32api
- -
@ -70,25 +69,27 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.
- -
- # Other - # Other
- /usr/pkg/lib - /usr/pkg/lib
- /opt/csw/lib /opt/lib - /opt/csw/lib /opt/lib
- /usr/openwin/lib - /usr/openwin/lib
- ) - )
- -
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
- /usr/pkg/bin - /usr/pkg/bin
- ) + "@glibc@"
- )
-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- /lib /usr/lib /usr/lib32 /usr/lib64 - /lib /usr/lib /usr/lib32 /usr/lib64
- ) + "@glibc@/lib"
- )
-list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include - /usr/include
- ) + "@glibc@/include"
-list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES )
LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include - /usr/include
- ) + "@glibc@/include"
+list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include") )
# Enable use of lib64 search path variants by default. # Enable use of lib64 search path variants by default.
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)