commit:     995aa8f608f9e28e5da8da60fddf081ba7bf5224
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 15:53:08 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 15:55:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995aa8f6

eclass/cmake-utils: switch Darwin to rpath mode, bug #642668

By Michael Weiser, relying on the other support that enables @rpath
entries, supported in macOS 10.5 and up.

Closes: https://bugs.gentoo.org/642668

 eclass/cmake-utils.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7b12a6e7d7f..b9f69a824b1 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -586,12 +586,10 @@ cmake-utils_src_configure() {
                        ELSE ()
 
                        SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" 
FORCE)
+                       SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
                        SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
                        SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-                       SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
-                       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)
                        SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL 
"" FORCE)
-                       SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE 
STRING "" FORCE)
 
                        ENDIF (NOT APPLE)
                _EOF_

Reply via email to