diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake/search-path.patch')
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/search-path.patch | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch deleted file mode 100644 index 31c85d6f522..00000000000 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake -index fe8e003..378512c 100644 ---- a/Modules/Platform/Linux.cmake -+++ b/Modules/Platform/Linux.cmake -@@ -36,13 +36,13 @@ else() - # 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 -- "Install .so files without execute permission.") -- else() -+ # 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() -+ # endif() - endif() - - # Match multiarch library directory names. -@@ -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() -+# if(EXISTS "/etc/debian_version") -+# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) -+#endif() -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index ccb2663..39834e6 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -- /usr/local /usr / -- -- # CMake install location -- "${_CMAKE_INSTALL_DIR}" -- -- # Project install destination. -- "${CMAKE_INSTALL_PREFIX}" -- ) -- --# 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 -- ) -- --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 -- ) -- --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ "@glibc@" - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ "@glibc@/lib" - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ "@glibc@/include" - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ "@glibc@/include" - ) - - # Enable use of lib64 search path variants by default. |