diff options
| author |   Dror Levin <spatz@gentoo.org> | 2009-11-10 00:56:29 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2009-11-10 00:56:29 +0000 |
| commit | f95c375328ef2597db0e2c95a527b6d257f06439 (patch) | |
| tree | 3552ad7898e28668694d21a19f57f0f9608e537b | |
| parent | QA: Avoid building all plugins for no reason (bug 291038). Remove old (diff) | |
| download | gentoo-2-f95c375328ef2597db0e2c95a527b6d257f06439.tar.gz gentoo-2-f95c375328ef2597db0e2c95a527b6d257f06439.tar.bz2 gentoo-2-f95c375328ef2597db0e2c95a527b6d257f06439.zip | |
Enable RPATH in Qt4 and Qt4 apps, fix bug 180872.
| -rw-r--r-- | eclass/qt4-build.eclass | 4 | ||||
| -rw-r--r-- | eclass/qt4.eclass | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 443427cdd7c8..227827e6a221 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.50 2009/11/09 19:35:44 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.51 2009/11/10 00:56:29 spatz Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -328,7 +328,7 @@ standard_configure_options() { ;; esac - myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -no-rpath + myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass index 92c9a07d707b..9d695566458a 100644 --- a/eclass/qt4.eclass +++ b/eclass/qt4.eclass @@ -1,6 +1,6 @@ # Copyright 2005-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.58 2009/05/22 22:21:38 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.59 2009/11/10 00:56:29 spatz Exp $ # @ECLASS: qt4.eclass # @MAINTAINER: @@ -274,7 +274,6 @@ eqmake4() { QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \ QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \ - QMAKE_RPATH= \ QMAKE_STRIP= \ "${projectfile}" "${@}" |