commit: bf6461ea2aa0343109435fd014d60f7394e7f574
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 22:20:51 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 22:21:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6461ea
dev-util/cmake: Bump to version 3.14.0_rc3. Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-util/cmake/Manifest | 2 +-
...cmake-3.14.0_rc2.ebuild => cmake-3.14.0_rc3.ebuild} | 2 +-
...x-dirs.patch => cmake-3.14.0_rc3-prefix-dirs.patch} | 18 ++++++++++--------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c5b00985744..b6edbbdf95d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,5 +2,5 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B
1db8c21abdcfac2612fa914d49f9edcf199240b
DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B
2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925
SHA512
c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B
3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9
SHA512
2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B
c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a
SHA512
5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc2.tar.gz 8846165 BLAKE2B
8b36ec26167e4bd83f0bf9b58a4ca2f0f9ee9994eeb3593279a03faae03c2fe6097fb0a7b6e8a83902afd5833c3f7bbd7602e78f052fb5c5d75f5b7a4db8aafe
SHA512
941d6c562e620dcabd7d821a0eb96c05674d877c196a68cc9cb870a21de7c486f7ce848722892d9764c3826b7276f7fbe7afc36e3b8f784fccff2a8feda9de30
+DIST cmake-3.14.0-rc3.tar.gz 8845905 BLAKE2B
496f478586b8db220364079e5e96cc27dc703879a9f28cc425047bcf6b62d09bda1077cdca5759793995d84258448ce2195cce6b41c0ad2ca401eeb5b20590d0
SHA512
2a783a21428c2e86ff081e35c0a3737b4594904cf560a14b84de11da9d85bd7ad0e1c03a2acbcd26c1e84cbbfbf6b5b273987f0196a121bfdbb94bbfcabd13ca
DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
SHA512
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
diff --git a/dev-util/cmake/cmake-3.14.0_rc2.ebuild
b/dev-util/cmake/cmake-3.14.0_rc3.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.14.0_rc2.ebuild
rename to dev-util/cmake/cmake-3.14.0_rc3.ebuild
index 75999dc1849..ce96349c214 100644
--- a/dev-util/cmake/cmake-3.14.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc3.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
PATCHES=(
# prefix
"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc2-prefix-dirs.patch
+ "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
# Next patch requires new work from prefix people
#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
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
similarity index 91%
rename from dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
rename to dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index 8b539bf5bab..d03b17551f0 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 <[email protected]>
-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
