From e12461b061fbfa6e480ae3fa9a19fb0745190f38 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 22 Apr 2012 16:47:30 +0200 Subject: [dev-util/cmake] Version bump. (Portage version: 2.2.0_alpha100/git/Linux i686, unsigned Manifest commit) --- .../cmake-2.8.0-darwin-default-install_name.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch (limited to 'dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch') 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"); -- cgit v1.2.3