summaryrefslogtreecommitdiff
path: root/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
diff options
context:
space:
mode:
authorJohannes Huber <johu@gmx.de>2011-10-07 16:39:26 +0200
committerJohannes Huber <johu@gmx.de>2011-10-07 16:42:34 +0200
commit7c82b23b8565870be4834ef200590c2655bc35b6 (patch)
treeaec1e24c0cb963626baf0a155de4a25a5c34033b /dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
parentff8a5053c3e02e8e76f15dc340af586f9ea643e3 (diff)
downloadkde-7c82b23b8565870be4834ef200590c2655bc35b6.tar.gz
kde-7c82b23b8565870be4834ef200590c2655bc35b6.tar.bz2
kde-7c82b23b8565870be4834ef200590c2655bc35b6.zip
[dew-util/cmake] Bump 2.8.6
(Portage version: 2.2.0_alpha62/git/Linux x86_64, signed Manifest commit with key DF018462)
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.patch20
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");