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

[Davide Pesavento]

commit:     149d4288ba43bbd2d279b6b1ea9f65d801360b0c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 15:19:18 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 15:19:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=149d4288

[qt4-build-multilib.eclass] Conditionalize sed.

According to the comment preceding it, this sed is needed only on Solaris.
Make it conditional on CHOST so that it isn't applied on other platforms.

 eclass/qt4-build-multilib.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index acf6b11..33c3ffe 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -257,14 +257,15 @@ qt4-build-multilib_src_prepare() {
        # this is needed for all systems with a separate -liconv, except
        # Darwin, for which the sources already cater for -liconv
        if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-               sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-                       -i config.tests/unix/iconv/iconv.pro \
+               sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \
+                       config.tests/unix/iconv/iconv.pro \
                        || die "sed iconv.pro failed"
        fi
 
-       # 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
+       if [[ ${CHOST} == *-solaris* ]]; then
+               sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = 
-Wl,--dynamic-list,' \
+                       mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+       fi
 
        # do not flirt with non-Prefix stuff, we're quite possessive
        sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \