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 AA9E31382C5 for ; Fri, 18 Dec 2020 20:19:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37413E091D; Fri, 18 Dec 2020 20:19:49 +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 1A2CFE091D for ; Fri, 18 Dec 2020 20:19:49 +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 F3B31340F78 for ; Fri, 18 Dec 2020 20:19:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9548757 for ; Fri, 18 Dec 2020 20:19:46 +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: <1608322782.3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.19.2.ebuild dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3 X-VCS-Branch: master Date: Fri, 18 Dec 2020 20:19:46 +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: 28c8fc36-22c6-4a8a-b505-d5ef4dcafbbe X-Archives-Hash: a1f8678f3dbc129f5b2a99d7213ccdca commit: 3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3 Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 18 20:16:35 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 18 20:19:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7bc76d dev-util/cmake-3.19.2: fix some issues when building with Clang, #757513 Changes by Jacob Floyd, to respect the Prefix local MacOSX.sdk and to drop any isysroot crap when using Clang. Bug: https://bugs.gentoo.org/757513 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-util/cmake/cmake-3.19.2.ebuild | 3 +++ dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dev-util/cmake/cmake-3.19.2.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild index 54a6d646dda..945b1c1e8b0 100644 --- a/dev-util/cmake/cmake-3.19.2.ebuild +++ b/dev-util/cmake/cmake-3.19.2.ebuild @@ -137,6 +137,9 @@ src_prepare() { # where things are via GCC configuration and ldwrapper sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ Modules/Platform/Apple-GNU-*.cmake || die + # disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.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 \ diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch index d03b17551f0..9a6054e9557 100644 --- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch +++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch @@ -17,7 +17,8 @@ Updated by Lars Wendler (cmake-3.9.0_rc2) Updated by Benda Xu (cmake-3.13.4) Updated by Lars Wendler (cmake-3.14.0_rc1) Updated by Lars Wendler (cmake-3.14.0_rc2) -Updated by Lars Wendler (cmake-3.14.0_rc3 +Updated by Lars Wendler (cmake-3.14.0_rc3) +Updated by Jacob Floyd (cmake-3.19.2) --- Modules/Platform/Darwin.cmake | 12 +++++++---- Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++-------- @@ -39,16 +40,17 @@ index 5590433a3b..b04383e51d 100644 endif() # Older OS X linkers do not report their framework search path -@@ -140,6 +140,8 @@ endif() +@@ -140,6 +140,9 @@ endif() # set up the default search directories for frameworks set(CMAKE_SYSTEM_FRAMEWORK_PATH ++ @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks + @GENTOO_PORTAGE_EPREFIX@Frameworks + @GENTOO_PORTAGE_EPREFIX@usr/lib ~/Library/Frameworks ) if(_CMAKE_OSX_SYSROOT_PATH) -@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT) +@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT) endif() endif()