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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 516C6158170 for ; Thu, 18 Jul 2024 19:15:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E004E2AD7; Thu, 18 Jul 2024 19:15:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 592E3E2AD7 for ; Thu, 18 Jul 2024 19:15:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55F6A335DE9 for ; Thu, 18 Jul 2024 19:15:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 822B51B89 for ; Thu, 18 Jul 2024 19:15:13 +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: <1721330110.a1b6da908b5861efcb29e3a6b534ca8a11117781.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-build/cmake/cmake-3.30.0.ebuild dev-build/cmake/cmake-9999.ebuild X-VCS-Directories: dev-build/cmake/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a1b6da908b5861efcb29e3a6b534ca8a11117781 X-VCS-Branch: master Date: Thu, 18 Jul 2024 19:15:13 +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: b6acbf0d-12f4-44ca-875b-f0eadde6a41e X-Archives-Hash: 0c038f2b2f62d31618bc32924cc57577 commit: a1b6da908b5861efcb29e3a6b534ca8a11117781 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jul 18 19:14:10 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jul 18 19:15:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b6da90 dev-build/cmake: fix compilation on macOS/Darwin Closes: https://bugs.gentoo.org/933744 Signed-off-by: Fabian Groffen gentoo.org> dev-build/cmake/cmake-3.30.0.ebuild | 8 ++++++++ dev-build/cmake/cmake-9999.ebuild | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/dev-build/cmake/cmake-3.30.0.ebuild b/dev-build/cmake/cmake-3.30.0.ebuild index c119ad22dc76..7957c7bb58b2 100644 --- a/dev-build/cmake/cmake-3.30.0.ebuild +++ b/dev-build/cmake/cmake-3.30.0.ebuild @@ -152,6 +152,14 @@ src_prepare() { sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ -e '/cmGlobalXCodeGenerator.h/d' \ Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die # Disable isysroot usage with GCC, we've properly instructed # where things are via GCC configuration and ldwrapper diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild index 199bff8efd14..f6f904da2105 100644 --- a/dev-build/cmake/cmake-9999.ebuild +++ b/dev-build/cmake/cmake-9999.ebuild @@ -153,6 +153,14 @@ src_prepare() { sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ -e '/cmGlobalXCodeGenerator.h/d' \ Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die # Disable isysroot usage with GCC, we've properly instructed # where things are via GCC configuration and ldwrapper