diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
| commit | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch) | |
| tree | 6a5171dd615dfeee62a45044144c66e864738fb0 /dev-util/cmake | |
| parent | ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff) | |
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/Manifest | 4 | ||||
| -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 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 9220bf90c80c..811c8d9fec09 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -5,7 +5,7 @@ AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f01 AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738 AUX cmake-3.11.4-fix-boost-detection.patch 996 BLAKE2B 195ade40e279ca85ee55b1d46353f8809f68e405a6c914c34340825f7f77ec5cb78ebee3f7aa12cc6f026a802db4bc893ac8570a03b76af708ea2df7a3ecadb1 SHA512 66da91fb39286d1745af733a806f60db313ddb0a506b29509aba66259a57cf8abf65fcc871114c5a2cff91eb8c27ca346dd75fbd29f773fb2d31cfead827f250 AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c -AUX cmake-3.14.0_rc3-prefix-dirs.patch 4688 BLAKE2B ec197f40246ff9b47f6515cec92f0ef497de2e96756cd7c12ea3fe7c71d5e2220c637210f663194c63e72924d89dbce7afe92fed01bca8947bdd76af6f5365b0 SHA512 9da6be335e5615b2e14fdcccbadd50a0e2df6e19476818358216501b657350c73fa6bdc1dcaedec1fa50e3e18e39544e2d2815d6f54dd5b4aa5860bdf35e8d52 +AUX cmake-3.14.0_rc3-prefix-dirs.patch 4791 BLAKE2B bd5dece28a5900c8dbd994701712b65d2c366c61cb01dfadc2a6f941c4cee9bdf9d390291fe08f76bea68e0e0078b116c73682516fa62d6064e10c4a063b4bf5 SHA512 b53055ab0a72051dbc11ab91944e484a493e421a724a6ee60433484b9734280e1d1ab51114afef14ecdae67a78a9734a277a18d8d5e1a272e8a558c849a36809 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303 @@ -23,5 +23,5 @@ DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60 EBUILD cmake-3.17.4-r1.ebuild 6135 BLAKE2B e2a5cc3192918239c62b6502374a585d8f25dfb795e492a43de513a8f89e601862c0e010cedb02441a716884abc55ff1b455739ceeb769e41c4e873233df2a11 SHA512 a0b1ed0cd63486d3f625cfce02c14bb7363199b950850bf03380d48b8126402659712dad7c0254033846b43faf4051413cc875bc882e86f658baa5eff59a2236 EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a -EBUILD cmake-3.19.2.ebuild 6620 BLAKE2B 08f857fbb4188519564decfb1c63a29f1269cd878466a8b8568bcd41640d2c0bd6c9f39769c4cad4f82843aca87ae08084441f969ae52f2f0f993a04d60d9e0f SHA512 b9c0a84740cfe4dc21efe715d22335bc56f615ee34d759113664c13fc35815fd7bad59849c79c6859ccf14d7d57f1114975ea8e44ee1cde7315c87c2d04f7b94 +EBUILD cmake-3.19.2.ebuild 6744 BLAKE2B ddc58bf2eeb856f5037afd96c74996d0d0edbbd6591874a71fbd61a5f50bef94bac3d7926e34b693cde7a661b2f810942438ee216c9af0a47a2de8c92476ad38 SHA512 764f96d50a9fa362dc803dc47699d71f444a34bd43365c0cedf9cc70253b8c1e9ac10cd961d3c564cbf016e45c55048744d174c41964672bd25bf3979807ed27 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340 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() |