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 72EFD1381F3 for ; Wed, 2 Dec 2020 18:59:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF989E0844; Wed, 2 Dec 2020 18:59:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 961D9E0844 for ; Wed, 2 Dec 2020 18:59:01 +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 82C46340FF7 for ; Wed, 2 Dec 2020 18:59:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 259DF45B for ; Wed, 2 Dec 2020 18:58:59 +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: <1606935534.96ed1a37d7fc76b5e970158d31ce5692dbf58a12.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.1.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 96ed1a37d7fc76b5e970158d31ce5692dbf58a12 X-VCS-Branch: master Date: Wed, 2 Dec 2020 18:58:59 +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: 671fa6c4-5529-4945-80c2-375ec72db49a X-Archives-Hash: a5eb4778aab011dbc5a64e8814ccb124 commit: 96ed1a37d7fc76b5e970158d31ce5692dbf58a12 Author: Fabian Groffen gentoo org> AuthorDate: Wed Dec 2 18:58:46 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Dec 2 18:58:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ed1a37 dev-util/cmake-3.19.1: fix compilation on Darwin Closes: https://bugs.gentoo.org/757426 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-util/cmake/cmake-3.19.1.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.19.1.ebuild b/dev-util/cmake/cmake-3.19.1.ebuild index 9c290413b18..54a6d646dda 100644 --- a/dev-util/cmake/cmake-3.19.1.ebuild +++ b/dev-util/cmake/cmake-3.19.1.ebuild @@ -129,14 +129,20 @@ cmake_src_test() { src_prepare() { cmake_src_prepare - # disable Xcode hooks, bug #652134 if [[ ${CHOST} == *-darwin* ]] ; then + # disable Xcode hooks, bug #652134 sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ Source/cmGlobalXCodeGenerator.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' \ Modules/Platform/Apple-GNU-*.cmake || die + # don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx fi # Add gcc libs to the default link paths