From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98BF5138359 for ; Sun, 23 Aug 2020 17:11:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B819FE07DB; Sun, 23 Aug 2020 17:11:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96628E07DB for ; Sun, 23 Aug 2020 17:11:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49F9034090F for ; Sun, 23 Aug 2020 17:10:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C44172EC for ; Sun, 23 Aug 2020 17:10:57 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1598202642.222acbcb270567379e34ebfdec3c0b5e6534628d.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.18.1.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 222acbcb270567379e34ebfdec3c0b5e6534628d X-VCS-Branch: master Date: Sun, 23 Aug 2020 17:10:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3644fc8d-ab6a-48a2-8266-ffa0ae238331 X-Archives-Hash: 076219a34ac08932ace2ecd9acf9a9bd commit: 222acbcb270567379e34ebfdec3c0b5e6534628d Author: James Le Cuirot gentoo org> AuthorDate: Wed Jul 22 22:24:17 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Aug 23 17:10:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222acbcb dev-util/cmake: Fix cross-compiling in 3.18.1 Closes: https://bugs.gentoo.org/503218 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: James Le Cuirot gentoo.org> dev-util/cmake/cmake-3.18.1.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-util/cmake/cmake-3.18.1.ebuild b/dev-util/cmake/cmake-3.18.1.ebuild index f8c1eef810b..c09e035ef01 100644 --- a/dev-util/cmake/cmake-3.18.1.ebuild +++ b/dev-util/cmake/cmake-3.18.1.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