Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Fri, 02 Mar 2018 08:47:51
Message-Id: 1519980449.5bf7eac4ccee5315cd88bc47106dc0b9bab5b8c6.kensington@gentoo
1 commit: 5bf7eac4ccee5315cd88bc47106dc0b9bab5b8c6
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 2 15:53:08 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 08:47:29 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5bf7eac4
7
8 cmake-utils.eclass: 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 623c353b46..de58d37add 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_