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 9A2A6138359 for ; Sun, 6 Sep 2020 16:46:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5611E0908; Sun, 6 Sep 2020 16:46:20 +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 CFC19E09D7 for ; Sun, 6 Sep 2020 16:46:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B9618335DAC for ; Sun, 6 Sep 2020 16:46:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F987349 for ; Sun, 6 Sep 2020 16:46:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1599410736.deb9c16acf7d2e1d5eeb838bde8c2073f9cb6e7f.asturm@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.2.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: deb9c16acf7d2e1d5eeb838bde8c2073f9cb6e7f X-VCS-Branch: master Date: Sun, 6 Sep 2020 16:46:18 +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: 4a23dd9f-2072-4492-9a5c-b74140421036 X-Archives-Hash: 92ac292e9d505444e4a4d00a24af8ab5 commit: deb9c16acf7d2e1d5eeb838bde8c2073f9cb6e7f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 5 17:52:52 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 6 16:45:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb9c16a dev-util/cmake: Detect if system cmake binary is broken cmake binary can be broken if FEATURES="-preserve-libs" is set. Bug: https://bugs.gentoo.org/720230 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/cmake/cmake-3.18.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.18.2.ebuild b/dev-util/cmake/cmake-3.18.2.ebuild index c09e035ef01..3e9f38a6689 100644 --- a/dev-util/cmake/cmake-3.18.2.ebuild +++ b/dev-util/cmake/cmake-3.18.2.ebuild @@ -139,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 -b \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then + if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" cmake_src_bootstrap fi