[patch] Patch against cmake-3.18.0.ebuild

0001-dev-util-cmake-Fix-cross-compiling-in-3.18.0.patch (text/plain), 1.42 KB, created by James Le Cuirot on 2020-07-22 22:29:05 UTC

From c8db4fc706f9335946c014def3172d9459e94136 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[e-mail]>
Date: Wed, 22 Jul 2020 23:24:17 +0100
Subject: [PATCH] dev-util/cmake: Fix cross-compiling in 3.18.0

Closes: https://bugs.gentoo.org/503218
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot <[e-mail]>
---
 dev-util/cmake/cmake-3.18.0.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-util/cmake/cmake-3.18.0.ebuild b/dev-util/cmake/cmake-3.18.0.ebuild
index c95cd8652c83..5328bf9c73b7 100644
--- a/dev-util/cmake/cmake-3.18.0.ebuild
+++ b/dev-util/cmake/cmake-3.18.0.ebuild
@@ -83,10 +83,8 @@ cmake_src_bootstrap() {
 			Source/kwsys/CMakeLists.txt || die
 	fi
 
-	tc-export CC CXX LD
-
 	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
 		--prefix="${T}/cmakestrap/" \
 		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
 		|| die "Bootstrap failed"
@@ -141,7 +139,7 @@ src_prepare() {
 		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
 		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
 		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
 		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 		cmake_src_bootstrap
 	fi
-- 
2.26.2