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 6339B1382C5 for ; Thu, 14 Jan 2021 13:40:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98BE1E0993; Thu, 14 Jan 2021 13:40:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 184B8E0995 for ; Thu, 14 Jan 2021 13:40:24 +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 86233340D3C for ; Thu, 14 Jan 2021 13:40:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D7B664B for ; Thu, 14 Jan 2021 13:40:20 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1610631618.918ca338cb2853bb8c94b6d8122631c4553ee93e.grobian@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.19.3.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 918ca338cb2853bb8c94b6d8122631c4553ee93e X-VCS-Branch: master Date: Thu, 14 Jan 2021 13:40:20 +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: d5273dec-be12-4050-b983-0b8aa01f51c7 X-Archives-Hash: 50e43d94fa2fd5835e94211e2d35f8cd commit: 918ca338cb2853bb8c94b6d8122631c4553ee93e Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 14 13:39:14 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 14 13:40:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918ca338 dev-util/cmake-3.19.3: disable Xcode hooks more drastically Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-util/cmake/cmake-3.19.3.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-util/cmake/cmake-3.19.3.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild index 3dbd001d537..93041717129 100644 --- a/dev-util/cmake/cmake-3.19.3.ebuild +++ b/dev-util/cmake/cmake-3.19.3.ebuild @@ -131,8 +131,11 @@ src_prepare() { if [[ ${CHOST} == *-darwin* ]] ; then # disable Xcode hooks, bug #652134 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ - Source/cmGlobalXCodeGenerator.cxx || die + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die # disable isysroot usage with GCC, we've properly instructed # where things are via GCC configuration and ldwrapper sed -i -e '/cmake_gnu_set_sysroot_flag/d' \