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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7b12a6e7d7f31fef0ae55ad94af86bbdcc013b37..b9f69a824b146c25ae4c17e92a2e0ea365f5482f 100644 (file)
--- 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_