diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2010-06-27 20:59:35 +0200 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2010-06-28 15:39:17 +0300 |
| commit | 24809f5ecafa63aee6541fa450766a74bf1b5467 (patch) | |
| tree | 4db35207f0bba30ba3f0f5f98452f27322de4ffc /dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch | |
| parent | 094f28b78ae614dcfdb9c83d0ac0ac7d6f42878e (diff) | |
| download | kde-24809f5ecafa63aee6541fa450766a74bf1b5467.tar.gz kde-24809f5ecafa63aee6541fa450766a74bf1b5467.tar.bz2 kde-24809f5ecafa63aee6541fa450766a74bf1b5467.zip | |
[dev-util/cmake] Fix java detection, should resolve bug 315229. Please test.
Diffstat (limited to 'dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch new file mode 100644 index 00000000000..6ee9b709dff --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch @@ -0,0 +1,23 @@ +Don't use .so for modules on darwin/macos. Use .bundle instead. +Patch by Heiko Przybyl + +--- Modules/Platform/Darwin.cmake ++++ Modules/Platform/Darwin.cmake +@@ -23,7 +23,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 "") + +@@ -45,7 +45,7 @@ + SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -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 ".dylib" ".so" ".a") ++SET(CMAKE_FIND_LIBRARY_SUFFIXES ".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 |