diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-01-13 10:02:13 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-01-13 10:02:44 +0100 |
| commit | d1742db94e44817130ab96eed8343e96068e937d (patch) | |
| tree | 08d6f9043e4dcff8baf4fd8ce05233436f11022d /dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch | |
| parent | a6042a48069c13ffb3501577c06b4c06acb1a664 (diff) | |
| download | kde-d1742db94e44817130ab96eed8343e96068e937d.tar.gz kde-d1742db94e44817130ab96eed8343e96068e937d.tar.bz2 kde-d1742db94e44817130ab96eed8343e96068e937d.zip | |
[dev-util/cmake] Revision bump. Adds new FindBoost.cmake patch which fixes bug 335108.
(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)
Diffstat (limited to 'dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch new file mode 100644 index 00000000000..4ef0c7b4b6f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch @@ -0,0 +1,20 @@ +The install_name of a library can be compared to the ELF soname, setting +it to just the library name (libx.1.dylib) is not sufficient on Mach-O, +as it uses full paths. Most apps have no clue about that, so they don't +do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html + +Provide a sane default that will allow merging most cmake-based +packages. If this location is not correct, Portage's QA checks will +catch that. + +--- Source/cmTarget.cxx ++++ Source/cmTarget.cxx +@@ -974,7 +974,7 @@ + this->Makefile->IsOn("MINGW")); + + // Setup default property values. +- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); ++ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); + this->SetPropertyDefault("INSTALL_RPATH", ""); + this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); + this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); |