diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2020-12-18 21:16:35 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2020-12-18 21:19:42 +0100 |
| commit | 3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3 (patch) | |
| tree | 2b8a99513ab13da8d19d2f9daf2cc830030232ba /dev-util | |
| parent | sys-cluster/kube-scheduler: 1.19.6 bump (diff) | |
| download | gentoo-3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3.tar.gz gentoo-3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3.tar.bz2 gentoo-3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3.zip | |
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 <grobian@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/cmake-3.19.2.ebuild | 3 | ||||
| -rw-r--r-- | 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 54a6d646dda4..945b1c1e8b09 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 d03b17551f0b..9a6054e9557f 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() |