From 48a6c44d292ec0fa222a5518993a00e6fe9d6031 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Thu, 6 Oct 2011 13:33:51 +0000 Subject: [PATCH] do not add extra runpath when EPREFIX is empty (bug#385839) --- eclass/cmake-utils.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 2ad81c047ff9..dc1363bc4f29 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.75 2011/08/29 01:28:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.76 2011/10/06 13:33:51 haubi Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -320,7 +320,9 @@ enable_cmake-utils_src_configure() { SET (CMAKE_CXX_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C++ compile command" FORCE) _EOF_ - if use prefix; then + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + + if [[ ${EPREFIX} ]]; then cat >> "${build_rules}" <<- _EOF_ # in Prefix we need rpath and must ensure cmake gets our default linker path # right ... except for Darwin hosts @@ -361,8 +363,6 @@ enable_cmake-utils_src_configure() { local mycmakeargs_local=("${mycmakeargs[@]}") fi - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= - # Common configure parameters (overridable) # NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable # No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect. -- 2.26.2