Disable rpath for Qt 4.8 and later (bug #380415). Thanks to dilfridge for testing.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c44313dcd33839b053e69e75472f35603a4829bd..25a883ff30382d26ed29fc924b3a5369cd568eea 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.51 2011/12/21 22:36:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.52 2011/12/21 22:47:35 pesa Exp $
+
+  21 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Disable rpath for Qt 4.8 and later (bug #380415). Thanks to dilfridge for
+  testing.
 
   21 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Remove obsolete workaround.

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index b04029edcd04ae50124f0047f74668819d1b7256..1b0c623df337ebc4e0b46a6730833d2bcd81562a 100644 (file)
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.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/qt4-build.eclass,v 1.105 2011/12/21 22:36:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.106 2011/12/21 22:47:35 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -502,6 +502,9 @@ standard_configure_options() {
        local exceptions="-exceptions"
        in_iuse exceptions && exceptions="$(qt_use exceptions)"
 
+       # bug 380415
+       version_is_at_least 4.8 && myconf+=" -no-rpath"
+
        # note about -reduce-relocations:
        # That flag seems to introduce major breakage to applications,
        # mostly to be seen as a core dump with the message "QPixmap: Must