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.8.0-darwin-default-install_name.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.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"); |