mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch

65 lines
1.5 KiB
Diff
Raw Normal View History

cmake: add all glibc outputs to system prefix
2016-04-13 20:04:11 +01:00
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
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
# search types.
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
cmake: add all glibc outputs to system prefix
2016-04-13 20:04:11 +01:00
- # Standard
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
- /usr/local /usr /
-
cmake: add all glibc outputs to system prefix
2016-04-13 20:04:11 +01:00
# 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
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
- # 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
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_dev@/include
cmake: add all glibc outputs to system prefix
2016-04-13 20:04:11 +01:00
)
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
-
cmake: add all glibc outputs to system prefix
2016-04-13 20:04:11 +01:00
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
- # 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
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_lib@/lib
cmake: add all glibc outputs to system prefix
2016-04-13 20:04:11 +01:00
)
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
- /usr/pkg/bin
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_bin@/bin
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
)
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_lib@/lib
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
)
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_dev@/include
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
)
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_dev@/include
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 15:31:46 +00:00
)
# Enable use of lib64 search path variants by default.
Copy permalink