[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     dbd1a5e07c634d3425c44a2191db0bacbbacf2db
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 14:51:09 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 14:51:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbd1a5e0

[qt4-build-multilib.eclass] Remove unneeded sed.

We already force the solaris-g++ mkspec on Solaris via the -platform
configure switch, therefore this sed is useless.

 eclass/qt4-build-multilib.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index f745627..acf6b11 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -265,8 +265,7 @@ qt4-build-multilib_src_prepare() {
        # we need some patches for Solaris
        sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = 
-Wl,--dynamic-list,' \
                mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-       # use GCC over SunStudio
-       sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
+
        # do not flirt with non-Prefix stuff, we're quite possessive
        sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
                mkspecs/$(qt4_get_mkspec)/qmake.conf || die