diff options
| author | Johannes Huber <johu@gmx.de> | 2011-07-11 07:47:34 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gmx.de> | 2011-07-11 17:08:49 +0200 |
| commit | 1010127c1205112376c2e788ddd46310a03667b5 (patch) | |
| tree | 5c5f38f90006dcc5950f1d9e36dd33bef2b5b06e /dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch | |
| parent | 10ed259b620254d4bc662f5c3f4d66e09518f4e6 (diff) | |
| download | kde-1010127c1205112376c2e788ddd46310a03667b5.tar.gz kde-1010127c1205112376c2e788ddd46310a03667b5.tar.bz2 kde-1010127c1205112376c2e788ddd46310a03667b5.zip | |
[dev-util/cmake] Bump 2.8.5
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"); |