From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXtLO-0001ul-Tc for garchives@archives.gentoo.org; Fri, 25 May 2012 12:10:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CF1EE08A2; Fri, 25 May 2012 12:09:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 60000E0978 for ; Fri, 25 May 2012 12:09:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4503C1B4035 for ; Fri, 25 May 2012 12:09:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0F9D2E542A for ; Fri, 25 May 2012 12:09:41 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1337947739.b0384047b6561c27f841796c6a00b2fb88ec6e8d.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: b0384047b6561c27f841796c6a00b2fb88ec6e8d X-VCS-Branch: master Date: Fri, 25 May 2012 12:09:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 135ecf5b-dc8b-4e3c-b1ad-a51d785edbd3 X-Archives-Hash: 136822ee38a4a8e315c9d63b9ff3be96 commit: b0384047b6561c27f841796c6a00b2fb88ec6e8d Author: Davide Pesavento gmail com> AuthorDate: Fri May 25 12:08:59 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri May 25 12:08:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Db0384047 [qt4-build.eclass] Re-enable rpath on prefix wrt bug 417169. --- eclass/qt4-build.eclass | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 2a7dcdb..a83bd71 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 $ =20 # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -417,8 +417,9 @@ qt4-build_src_configure() { # exceptions USE flag conf+=3D" $(in_iuse exceptions && qt_use exceptions || echo -exceptions= )" =20 - # disable RPATH on Qt >=3D 4.8 (bug 380415) - version_is_at_least 4.8 && conf+=3D" -no-rpath" + # disable rpath on Qt >=3D 4.8 (bug 380415) + # but leave it enabled on prefix (bug 417169) + version_is_at_least 4.8 && use !prefix && conf+=3D" -no-rpath" =20 # precompiled headers don't work on hardened, where the flag is masked conf+=3D" $(qt_use pch)"