1 |
grobian 10/01/31 15:49:13 |
2 |
|
3 |
Added: cmake-2.8.0-darwin-default-install_name.patch |
4 |
Log: |
5 |
Revision bump, add patch to set a default install_name on Darwin. This is sufficient for most cases, and allows us to revert some install_name_tool hacks for cmake-based packages. |
6 |
(Portage version: 2.2.00.15274-prefix/cvs/Darwin powerpc) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: cmake-2.8.0-darwin-default-install_name.patch |
15 |
=================================================================== |
16 |
The install_name of a library can be compared to the ELF soname, setting |
17 |
it to just the library name (libx.1.dylib) is not sufficient on Mach-O, |
18 |
as it uses full paths. Most apps have no clue about that, so they don't |
19 |
do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html |
20 |
|
21 |
Provide a sane default that will allow merging most cmake-based |
22 |
packages. If this location is not correct, Portage's QA checks will |
23 |
catch that. |
24 |
|
25 |
--- Source/cmTarget.cxx |
26 |
+++ Source/cmTarget.cxx |
27 |
@@ -974,7 +974,7 @@ |
28 |
this->Makefile->IsOn("MINGW")); |
29 |
|
30 |
// Setup default property values. |
31 |
- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); |
32 |
+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); |
33 |
this->SetPropertyDefault("INSTALL_RPATH", ""); |
34 |
this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); |
35 |
this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); |