diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2019-11-19 13:42:40 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-11-19 13:42:57 +0100 |
| commit | 9d483abb28d8c4c794652234a48230e8691f896e (patch) | |
| tree | 17d59ca04a8b8b92a8bf5f0161589e9d13d34959 /dev-util/cmake | |
| parent | app-metrics/blackbox_exporter: Remove old (diff) | |
| download | gentoo-9d483abb28d8c4c794652234a48230e8691f896e.tar.gz gentoo-9d483abb28d8c4c794652234a48230e8691f896e.tar.bz2 gentoo-9d483abb28d8c4c794652234a48230e8691f896e.zip | |
dev-util/cmake: Bump to version 3.16.0_rc4. Removed old
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.16.0_rc4.ebuild (renamed from dev-util/cmake/cmake-3.16.0_rc3.ebuild) | 2 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch | 41 |
3 files changed, 43 insertions, 2 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 2ae2af3874b0..c07984d761ff 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -3,4 +3,4 @@ DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650 DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6 -DIST cmake-3.16.0-rc3.tar.gz 9102878 BLAKE2B af0a74ec617804c0a8680f0325274927dbcea5aa375223dccd3ce43f6b6c77ef0c456b89bb4f5e4e22e856f7dd9f3e1dead62d2b029749e2252e2a9898647283 SHA512 137faa9c4b90ec23b95660b12310f5a11374c461b9149fb93e5ce8ed319d453f10e12ff5a3c9df2cfc3408998bdeddf4ffb3d3b62702575a740ddd5b650905a4 +DIST cmake-3.16.0-rc4.tar.gz 9107275 BLAKE2B 659210919781883e3c40f0b5ecb638a2c50b302f10a8dd3d2d79d850f1edcaf58387fde0e151f7f71a33e75dd8636e8bfa88751739f3e1c0a5c4f21c7d05f4f4 SHA512 833c2aec8d19b8402bff2c7790914d2be325c3ae334038d554435214b3f702b4501cc0942e1894b745261e4932dd74ade4a790ccd917bad83bbb2435b9395572 diff --git a/dev-util/cmake/cmake-3.16.0_rc3.ebuild b/dev-util/cmake/cmake-3.16.0_rc4.ebuild index d9456163e0ef..7380a3a30f8b 100644 --- a/dev-util/cmake/cmake-3.16.0_rc3.ebuild +++ b/dev-util/cmake/cmake-3.16.0_rc4.ebuild @@ -51,7 +51,7 @@ SITEFILE="50${PN}-gentoo.el" PATCHES=( # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch # Next patch requires new work from prefix people #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch diff --git a/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch new file mode 100644 index 000000000000..5aac1be55da6 --- /dev/null +++ b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch @@ -0,0 +1,41 @@ +From ce929588adf61ee24bb6850f4b9a58cc7ea224c7 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Tue, 19 Nov 2019 12:28:53 +0100 +Subject: [PATCH] Don't use .so for modules on darwin/macos. Use .bundle + instead. + +Patch by Heiko Przybyl + +Forward-ported from 2.8.10 to 3.4.0-rc1 +Forward-ported from 3.4.0-rc1 to 3.16.0-rc4 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + Modules/Platform/Darwin.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake +index 1482d76ae6..6a432963b6 100644 +--- a/Modules/Platform/Darwin.cmake ++++ b/Modules/Platform/Darwin.cmake +@@ -43,7 +43,7 @@ endif() + set(CMAKE_SHARED_LIBRARY_PREFIX "lib") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") + set(CMAKE_SHARED_MODULE_PREFIX "lib") +-set(CMAKE_SHARED_MODULE_SUFFIX ".so") ++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") + set(CMAKE_MODULE_EXISTS 1) + set(CMAKE_DL_LIBS "") + +@@ -67,7 +67,7 @@ foreach(lang C CXX OBJC OBJCXX) + endforeach() + + set(CMAKE_PLATFORM_HAS_INSTALLNAME 1) +-set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") ++set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a") + + # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree + # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache +-- +2.24.0 + |