diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-util/cmake/files | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch | 41 |
1 files changed, 41 insertions, 0 deletions
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 + |