mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
Revert "cmake: Update to 2.8.11.2"
This breaks some packages (notably liblapack) due to a broken macro
(CTEST_CUSTOM_POST_TEST). See NixOS/nixpkgs#762
This reverts commit ebc424c3ab.
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy
parent
01294254a0
commit
0de17d6111
@ -7,7 +7,7 @@ with stdenv.lib;
|
||||
let
|
||||
os = stdenv.lib.optionalString;
|
||||
majorVersion = "2.8";
|
||||
minorVersion = "11.2";
|
||||
minorVersion = "9";
|
||||
version = "${majorVersion}.${minorVersion}";
|
||||
in
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
||||
sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
|
||||
sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@ -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
|
||||
--- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake 2013-07-02 15:41:40.000000000 +0200
|
||||
+++ cmake-2.8.11.2/Modules/Platform/Linux.cmake 2013-07-15 11:43:30.557888066 +0200
|
||||
@@ -36,13 +36,8 @@
|
||||
diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
|
||||
--- cmake-2.8.5-orig/Modules/Platform/Linux.cmake 2011-07-08 14:21:44.000000000 +0200
|
||||
+++ cmake-2.8.5/Modules/Platform/Linux.cmake 2011-07-21 19:45:00.000000000 +0200
|
||||
@@ -36,13 +36,13 @@
|
||||
# checking the platform every time. This option is advanced enough
|
||||
# that only package maintainers should need to adjust it. They are
|
||||
# capable of providing a setting on the command line.
|
||||
- if(EXISTS "/etc/debian_version")
|
||||
- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
|
||||
- IF(EXISTS "/etc/debian_version")
|
||||
- SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
|
||||
- "Install .so files without execute permission.")
|
||||
- else()
|
||||
- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
|
||||
- "Install .so files without execute permission.")
|
||||
- endif()
|
||||
+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
|
||||
+ "Install .so files without execute permission.")
|
||||
endif()
|
||||
- ELSE(EXISTS "/etc/debian_version")
|
||||
+ #IF(EXISTS "/etc/debian_version")
|
||||
+ # SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
|
||||
+ # "Install .so files without execute permission.")
|
||||
+ #ELSE(EXISTS "/etc/debian_version")
|
||||
SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
|
||||
"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.
|
||||
@@ -50,8 +45,3 @@
|
||||
@@ -52,6 +52,6 @@
|
||||
|
||||
include(Platform/UnixPaths)
|
||||
|
||||
-# Debian has lib64 paths only for compatibility so they should not be
|
||||
-# searched.
|
||||
-if(EXISTS "/etc/debian_version")
|
||||
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
||||
-endif()
|
||||
diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake
|
||||
--- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake 2013-07-02 15:41:40.000000000 +0200
|
||||
+++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake 2013-07-15 11:42:02.949204549 +0200
|
||||
@@ -31,58 +31,13 @@
|
||||
|
||||
# List common installation prefixes. These will be used for all
|
||||
# Debian has lib64 paths only for compatibility so they should not be
|
||||
# searched.
|
||||
-IF(EXISTS "/etc/debian_version")
|
||||
- SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
||||
-ENDIF(EXISTS "/etc/debian_version")
|
||||
+#IF(EXISTS "/etc/debian_version")
|
||||
+# SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
||||
+#ENDIF(EXISTS "/etc/debian_version")
|
||||
diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
|
||||
--- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake 2011-07-08 14:21:44.000000000 +0200
|
||||
+++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake 2011-07-21 19:50:52.000000000 +0200
|
||||
@@ -33,55 +33,18 @@
|
||||
# search types.
|
||||
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
- # Standard
|
||||
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
# Standard
|
||||
- /usr/local /usr /
|
||||
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@")
|
||||
|
||||
-
|
||||
- # CMake install location
|
||||
- "${_CMAKE_INSTALL_DIR}"
|
||||
+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib")
|
||||
|
||||
-
|
||||
- # Project install destination.
|
||||
- "${CMAKE_INSTALL_PREFIX}"
|
||||
- )
|
||||
+list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
|
||||
|
||||
-
|
||||
-# 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
|
||||
- /usr/include/w32api
|
||||
-
|
||||
@ -57,11 +56,11 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.
|
||||
-
|
||||
- # Other
|
||||
- /usr/pkg/include
|
||||
- /opt/csw/include /opt/include
|
||||
- /opt/csw/include /opt/include
|
||||
- /usr/openwin/include
|
||||
- )
|
||||
-
|
||||
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||
-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||
- # Windows API on Cygwin
|
||||
- /usr/lib/w32api
|
||||
-
|
||||
@ -70,25 +69,27 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.
|
||||
-
|
||||
- # Other
|
||||
- /usr/pkg/lib
|
||||
- /opt/csw/lib /opt/lib
|
||||
- /opt/csw/lib /opt/lib
|
||||
- /usr/openwin/lib
|
||||
- )
|
||||
-
|
||||
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
||||
-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
||||
- /usr/pkg/bin
|
||||
- )
|
||||
-
|
||||
-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
+ "@glibc@"
|
||||
)
|
||||
|
||||
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
- /lib /usr/lib /usr/lib32 /usr/lib64
|
||||
- )
|
||||
-
|
||||
-list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
+ "@glibc@/lib"
|
||||
)
|
||||
|
||||
LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
- )
|
||||
-list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
+ "@glibc@/include"
|
||||
)
|
||||
LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
- )
|
||||
+list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
|
||||
+ "@glibc@/include"
|
||||
)
|
||||
|
||||
# Enable use of lib64 search path variants by default.
|
||||
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user