diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:04:11 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-14 01:03:23 +0300 |
| commit | 52637e22cd72043195bc9233539ccd70aab8433d (patch) | |
| tree | 0d0ac75048adf654887746c3baa3df785aaf1288 /pkgs/development | |
| parent | d528c7d8f57255553d858a908391ce07b4712e0e (diff) | |
| download | nixlib-52637e22cd72043195bc9233539ccd70aab8433d.tar nixlib-52637e22cd72043195bc9233539ccd70aab8433d.tar.gz nixlib-52637e22cd72043195bc9233539ccd70aab8433d.tar.bz2 nixlib-52637e22cd72043195bc9233539ccd70aab8433d.tar.lz nixlib-52637e22cd72043195bc9233539ccd70aab8433d.tar.xz nixlib-52637e22cd72043195bc9233539ccd70aab8433d.tar.zst nixlib-52637e22cd72043195bc9233539ccd70aab8433d.zip | |
cmake: add all glibc outputs to system prefix
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/search-path-3.2.patch | 58 |
1 files changed, 24 insertions, 34 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch index 0a2d4ad43ab7..b61982efb9a7 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch @@ -1,31 +1,20 @@ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 20ee1d1..39834e6 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,64 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) +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 +- # Standard - /usr/local /usr / - -- # CMake install location -- "${_CMAKE_INSTALL_DIR}" -- ) --if (NOT CMAKE_FIND_NO_INSTALL_PREFIX) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Project install destination. -- "${CMAKE_INSTALL_PREFIX}" -- ) -- if(CMAKE_STAGING_PREFIX) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # User-supplied staging prefix. -- "${CMAKE_STAGING_PREFIX}" -- ) -- endif() --endif() -- --# List common include file locations not under the common prefixes. --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH + # 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 - @@ -36,9 +25,10 @@ index 20ee1d1..39834e6 100644 - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -- ) ++ @glibc_dev@/include + ) - --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH - # Windows API on Cygwin - /usr/lib/w32api - @@ -49,26 +39,26 @@ index 20ee1d1..39834e6 100644 - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -- ) -- --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH ++ @glibc_lib@/lib + ) + + list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ "@glibc_bin@" ++ @glibc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ "@glibc_lib@/lib" ++ @glibc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc_dev@/include" ++ @glibc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc_dev@/include" ++ @glibc_dev@/include ) # Enable use of lib64 search path variants by default. - |