diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
| commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
| tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /dev-util/cmake/files | |
| parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) | |
gentoo resync : 20.02.2019
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch (renamed from dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch) | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch index a4890ffbb2fa..8b539bf5babb 100644 --- a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch +++ b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch @@ -1,6 +1,6 @@ -From c5d74cb5b1cf87ee933f7547f62dbbb96134964d Mon Sep 17 00:00:00 2001 +From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001 From: Lars Wendler <polynomial-c@gentoo.org> -Date: Sun, 10 Feb 2019 22:40:33 +0100 +Date: Mon, 18 Feb 2019 10:13:45 +0100 Subject: [PATCH] Set some proper paths to make cmake find our tools. The ebuild now adds an extra / at the end of $EPREFIX so that it is @@ -16,13 +16,14 @@ Updated by Michael Palimaka (cmake-3.0.0) Updated by Lars Wendler (cmake-3.9.0_rc2) Updated by Benda Xu (cmake-3.13.4) Updated by Lars Wendler (cmake-3.14.0_rc1) +Updated by Lars Wendler (cmake-3.14.0_rc2) --- - Modules/Platform/Darwin.cmake | 12 ++++++---- - Modules/Platform/UnixPaths.cmake | 38 ++++++++++++++++++++++++-------- - 2 files changed, 37 insertions(+), 13 deletions(-) + Modules/Platform/Darwin.cmake | 12 +++++++---- + Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++-------- + 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake -index a73ffbae75..d00eac4ca4 100644 +index 5590433a3b..b04383e51d 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -116,9 +116,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) @@ -65,7 +66,7 @@ index a73ffbae75..d00eac4ca4 100644 "/Applications" "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 4ae451472b..aa34bd9a31 100644 +index 46c24bbf9b..54210f6599 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) @@ -78,7 +79,7 @@ index 4ae451472b..aa34bd9a31 100644 # CMake install location "${_CMAKE_INSTALL_DIR}" -@@ -50,33 +51,52 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH +@@ -50,28 +51,46 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH # List common include file locations not under the common prefixes. list(APPEND CMAKE_SYSTEM_INCLUDE_PATH @@ -116,13 +117,6 @@ index 4ae451472b..aa34bd9a31 100644 + @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 ) - # Platform-wide directories to avoid adding via -I<dir>. - list(APPEND CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include -+ @GENTOO_HOST@/usr/include - ) - # Default per-language values. These may be later replaced after # parsing the implicit directory information from compiler output. set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT @@ -140,5 +134,5 @@ index 4ae451472b..aa34bd9a31 100644 set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} -- -2.20.1 +2.21.0.rc1 |