forked from mirrors/nixpkgs
cmake: 3.8.2 -> 3.9.1
This commit is contained in:
parent
38dc9a870f
commit
f3ac052f24
|
@ -12,8 +12,8 @@ with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
os = stdenv.lib.optionalString;
|
os = stdenv.lib.optionalString;
|
||||||
majorVersion = "3.8";
|
majorVersion = "3.9";
|
||||||
minorVersion = "2";
|
minorVersion = "1";
|
||||||
version = "${majorVersion}.${minorVersion}";
|
version = "${majorVersion}.${minorVersion}";
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -24,8 +24,8 @@ 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";
|
||||||
# from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
|
# from https://cmake.org/files/v3.9/cmake-3.9.1-SHA-256.txt
|
||||||
sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
|
sha256 = "d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = optionalString (!useSharedLibraries) ''
|
prePatch = optionalString (!useSharedLibraries) ''
|
||||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Don't search in non-Nix locations such as /usr, but do search in our libc.
|
# Don't search in non-Nix locations such as /usr, but do search in our libc.
|
||||||
patches = [ ./search-path-3.2.patch ]
|
patches = [ ./search-path-3.9.patch ]
|
||||||
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
|
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
|
||||||
|
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
|
|
|
@ -1,77 +0,0 @@
|
||||||
diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake
|
|
||||||
--- cmake-3.4.3/Modules/Platform/UnixPaths.cmake 2016-01-25 19:57:19.000000000 +0300
|
|
||||||
+++ cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:20:08.963492213 +0300
|
|
||||||
@@ -32,9 +32,6 @@
|
|
||||||
# List common installation prefixes. These will be used for all
|
|
||||||
# search types.
|
|
||||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
|
||||||
- # Standard
|
|
||||||
- /usr/local /usr /
|
|
||||||
-
|
|
||||||
# CMake install location
|
|
||||||
"${_CMAKE_INSTALL_DIR}"
|
|
||||||
)
|
|
||||||
@@ -53,44 +50,25 @@
|
|
||||||
|
|
||||||
# List common include file locations not under the common prefixes.
|
|
||||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
|
||||||
- # Windows API on Cygwin
|
|
||||||
- /usr/include/w32api
|
|
||||||
-
|
|
||||||
- # X11
|
|
||||||
- /usr/X11R6/include /usr/include/X11
|
|
||||||
-
|
|
||||||
- # Other
|
|
||||||
- /usr/pkg/include
|
|
||||||
- /opt/csw/include /opt/include
|
|
||||||
- /usr/openwin/include
|
|
||||||
+ @libc_dev@/include
|
|
||||||
)
|
|
||||||
-
|
|
||||||
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
|
||||||
- # Windows API on Cygwin
|
|
||||||
- /usr/lib/w32api
|
|
||||||
-
|
|
||||||
- # X11
|
|
||||||
- /usr/X11R6/lib /usr/lib/X11
|
|
||||||
-
|
|
||||||
- # Other
|
|
||||||
- /usr/pkg/lib
|
|
||||||
- /opt/csw/lib /opt/lib
|
|
||||||
- /usr/openwin/lib
|
|
||||||
+ @libc_lib@/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
|
||||||
- /usr/pkg/bin
|
|
||||||
+ @libc_bin@/bin
|
|
||||||
)
|
|
||||||
|
|
||||||
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
|
||||||
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
|
||||||
+ @libc_lib@/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
|
||||||
- /usr/include
|
|
||||||
+ @libc_dev@/include
|
|
||||||
)
|
|
||||||
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
|
||||||
- /usr/include
|
|
||||||
+ @libc_dev@/include
|
|
||||||
)
|
|
||||||
|
|
||||||
# Enable use of lib64 search path variants by default.
|
|
||||||
diff -ur cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake cmake-3.7.2/Modules/Platform/WindowsPaths.cmake
|
|
||||||
--- cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake 2017-04-26 09:08:39.095674666 -0700
|
|
||||||
+++ cmake-3.7.2/Modules/Platform/WindowsPaths.cmake 2017-04-28 22:32:10.379015998 -0700
|
|
||||||
@@ -66,7 +66,7 @@
|
|
||||||
|
|
||||||
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
|
||||||
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
|
||||||
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
|
||||||
+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
|
||||||
diff -ur cmake-3.7.2-orig/Source/cmFindPackageCommand.cxx cmake-3.7.2/Source/cmFindPackageCommand.cxx
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake
|
||||||
|
--- cmake-3.9.1/Modules/Platform/UnixPaths.cmake 2017-08-10 13:36:32.000000000 +0000
|
||||||
|
+++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake 2017-09-03 01:24:31.901473539 +0000
|
||||||
|
@@ -22,9 +22,6 @@
|
||||||
|
# List common installation prefixes. These will be used for all
|
||||||
|
# search types.
|
||||||
|
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||||
|
- # Standard
|
||||||
|
- /usr/local /usr /
|
||||||
|
-
|
||||||
|
# CMake install location
|
||||||
|
"${_CMAKE_INSTALL_DIR}"
|
||||||
|
)
|
||||||
|
@@ -43,31 +40,26 @@
|
||||||
|
|
||||||
|
# Non "standard" but common install prefixes
|
||||||
|
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||||
|
- /usr/X11R6
|
||||||
|
- /usr/pkg
|
||||||
|
- /opt
|
||||||
|
)
|
||||||
|
|
||||||
|
# List common include file locations not under the common prefixes.
|
||||||
|
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||||
|
- # X11
|
||||||
|
- /usr/include/X11
|
||||||
|
+ @libc_dev@/include
|
||||||
|
)
|
||||||
|
|
||||||
|
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||||
|
- # X11
|
||||||
|
- /usr/lib/X11
|
||||||
|
+ @libc_lib@/lib
|
||||||
|
)
|
||||||
|
|
||||||
|
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||||
|
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
||||||
|
+ @libc_lib@/lib
|
||||||
|
)
|
||||||
|
|
||||||
|
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||||
|
- /usr/include
|
||||||
|
+ @libc_dev@/include
|
||||||
|
)
|
||||||
|
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||||
|
- /usr/include
|
||||||
|
+ @libc_dev@/include
|
||||||
|
)
|
||||||
|
|
||||||
|
# Enable use of lib32 and lib64 search path variants by default.
|
||||||
|
diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake
|
||||||
|
--- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake 2017-08-10 13:36:32.000000000 +0000
|
||||||
|
+++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake 2017-09-03 01:19:32.808355986 +0000
|
||||||
|
@@ -66,7 +66,7 @@
|
||||||
|
|
||||||
|
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||||||
|
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
||||||
|
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||||
|
+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
Loading…
Reference in a new issue