diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
| commit | 1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba (patch) | |
| tree | 475ec53133c361c13c0a1b1793fd1e00c1e0b3ce /dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch | |
| parent | f5837fc796cabbbe572d5b5879eb4ce0aef665b4 (diff) | |
| parent | e1cdc85bc123113b6b9fb4212effda45ef262185 (diff) | |
| download | kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.gz kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.bz2 kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde
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"); |
