diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
| commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
| tree | 3cb05783d73b2c33589ba305144a31c718e123cd /dev-util/cmake/files | |
| parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) | |
gentoo resync : 03.03.2019
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch (renamed from dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch) | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch index 8b539bf5babb..d03b17551f0b 100644 --- a/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch +++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch @@ -1,6 +1,6 @@ -From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001 +From 8ab270bf43f038bba4f992031508b065fa83f390 Mon Sep 17 00:00:00 2001 From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 18 Feb 2019 10:13:45 +0100 +Date: Fri, 1 Mar 2019 23:11:41 +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 @@ -17,6 +17,7 @@ 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) +Updated by Lars Wendler (cmake-3.14.0_rc3 --- Modules/Platform/Darwin.cmake | 12 +++++++---- Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++-------- @@ -66,7 +67,7 @@ index 5590433a3b..b04383e51d 100644 "/Applications" "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 46c24bbf9b..54210f6599 100644 +index 97f744d521..8d11827371 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) @@ -79,7 +80,7 @@ index 46c24bbf9b..54210f6599 100644 # CMake install location "${_CMAKE_INSTALL_DIR}" -@@ -50,28 +51,46 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH +@@ -50,17 +51,33 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH # List common include file locations not under the common prefixes. list(APPEND CMAKE_SYSTEM_INCLUDE_PATH @@ -117,22 +118,23 @@ index 46c24bbf9b..54210f6599 100644 + @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 ) - # Default per-language values. These may be later replaced after + if(CMAKE_SYSROOT_COMPILE) +@@ -73,11 +90,13 @@ endif() # parsing the implicit directory information from compiler output. set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} -- /usr/include +- "${_cmake_sysroot_compile}/usr/include" + @GENTOO_PORTAGE_EPREFIX@usr/include + @GENTOO_HOST@/usr/include ) set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} -- /usr/include +- "${_cmake_sysroot_compile}/usr/include" + @GENTOO_PORTAGE_EPREFIX@usr/include + @GENTOO_HOST@/usr/include ) set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} -- -2.21.0.rc1 +2.21.0 |