diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-05-25 12:06:05 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-05-25 12:06:05 +0000 |
| commit | ad81ddeac9589c321dc36f49454fc0ca22594275 (patch) | |
| tree | 0cda6136fd0fd1bdf6121044134e885d87a5beb3 /eclass | |
| parent | Stable for amd64, wrt bug #417317 (diff) | |
| download | gentoo-2-ad81ddeac9589c321dc36f49454fc0ca22594275.tar.gz gentoo-2-ad81ddeac9589c321dc36f49454fc0ca22594275.tar.bz2 gentoo-2-ad81ddeac9589c321dc36f49454fc0ca22594275.zip | |
Re-enable rpath on prefix wrt bug 417169.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 803ba08443ff..f5445aae9a32 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.266 2012/05/24 18:18:11 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.267 2012/05/25 12:06:05 pesa Exp $ + + 25 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Re-enable rpath on prefix wrt bug 417169. 24 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass: Remove obsolete pkg_pretend function. diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 2a7dcdb335d2..a83bd71f7743 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.130 2012/05/22 13:41:59 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -417,8 +417,9 @@ qt4-build_src_configure() { # exceptions USE flag conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" - # disable RPATH on Qt >= 4.8 (bug 380415) - version_is_at_least 4.8 && conf+=" -no-rpath" + # disable rpath on Qt >= 4.8 (bug 380415) + # but leave it enabled on prefix (bug 417169) + version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath" # precompiled headers don't work on hardened, where the flag is masked conf+=" $(qt_use pch)" |