diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2015-11-13 13:42:20 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-11-13 13:42:52 +0100 |
| commit | 91aeb46594f879c61dcda03227ee2421a520642e (patch) | |
| tree | edbe9802cf6fe8f6f8dcd42533d78c4bc3f95a29 /dev-util/cmake/files | |
| parent | Merge remote-tracking branch 'remotes/10ne1/master-update-i8k' (diff) | |
| download | gentoo-91aeb46594f879c61dcda03227ee2421a520642e.tar.gz gentoo-91aeb46594f879c61dcda03227ee2421a520642e.tar.bz2 gentoo-91aeb46594f879c61dcda03227ee2421a520642e.zip | |
dev-util/cmake: Bump to version 3.4.0
Package-Manager: portage-2.2.24
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch new file mode 100644 index 000000000000..2808ed79f735 --- /dev/null +++ b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch @@ -0,0 +1,25 @@ +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 + +--- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake ++++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake +@@ -26,7 +26,7 @@ + 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 "") + +@@ -53,7 +53,7 @@ + set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") + set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") + set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") +-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 |