| 1 |
commit: 995aa8f608f9e28e5da8da60fddf081ba7bf5224 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 2 15:53:08 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 2 15:55:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995aa8f6 |
| 7 |
|
| 8 |
eclass/cmake-utils: switch Darwin to rpath mode, bug #642668 |
| 9 |
|
| 10 |
By Michael Weiser, relying on the other support that enables @rpath |
| 11 |
entries, supported in macOS 10.5 and up. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/642668 |
| 14 |
|
| 15 |
eclass/cmake-utils.eclass | 4 +--- |
| 16 |
1 file changed, 1 insertion(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 19 |
index 7b12a6e7d7f..b9f69a824b1 100644 |
| 20 |
--- a/eclass/cmake-utils.eclass |
| 21 |
+++ b/eclass/cmake-utils.eclass |
| 22 |
@@ -586,12 +586,10 @@ cmake-utils_src_configure() { |
| 23 |
ELSE () |
| 24 |
|
| 25 |
SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE) |
| 26 |
+ SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE) |
| 27 |
SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) |
| 28 |
SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
| 29 |
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "") |
| 30 |
- SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) |
| 31 |
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) |
| 32 |
- SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE) |
| 33 |
|
| 34 |
ENDIF (NOT APPLE) |
| 35 |
_EOF_ |
Archives