diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-21 23:31:11 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-21 23:31:11 +0000 |
| commit | 3a76bd7bb3b62f00ab03c85346e7c58b0b53bb0d (patch) | |
| tree | 85bd3be047726522a205d62f5917e1d6fd7023f3 | |
| parent | Added pkgconfig dependency, see bug #397593. (diff) | |
| download | gentoo-2-3a76bd7bb3b62f00ab03c85346e7c58b0b53bb0d.tar.gz gentoo-2-3a76bd7bb3b62f00ab03c85346e7c58b0b53bb0d.tar.bz2 gentoo-2-3a76bd7bb3b62f00ab03c85346e7c58b0b53bb0d.zip | |
Dont force CMAKE_BUILD_WITH_INSTALL_RPATH in APPLE prefix on request from
prefix guys, bug 398437
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8f315fcc61f6..2cffe75dbbe0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.101 2012/01/21 20:44:28 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.102 2012/01/21 23:31:11 dilfridge Exp $ + + 21 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cmake-utils.eclass: + Dont force CMAKE_BUILD_WITH_INSTALL_RPATH in APPLE prefix on request from + prefix guys, bug 398437 21 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Force autoreconf on user patches only. diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index dc1363bc4f29..e0db0fe40dff 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.76 2011/10/06 13:33:51 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.77 2012/01/21 23:31:11 dilfridge Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -336,7 +336,7 @@ enable_cmake-utils_src_configure() { SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX:-/usr}" CACHE STRING ""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 "" FORCE) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "") SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX:-/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}${PREFIX:-/usr}/lib" CACHE STRING "" FORCE) |