From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-792320-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 0109F138C48
for <garchives@archives.gentoo.org>; Sun, 12 Apr 2015 15:54:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B3B21E09D4;
Sun, 12 Apr 2015 15:54:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 49647E09D2
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2015 15:54:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8341A340B00
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2015 15:54:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2768015C54
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2015 15:54:43 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" <pesa@gentoo.org>
Message-ID: <1428851958.149d4288ba43bbd2d279b6b1ea9f65d801360b0c.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt4-build-multilib.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 149d4288ba43bbd2d279b6b1ea9f65d801360b0c
X-VCS-Branch: master
Date: Sun, 12 Apr 2015 15:54:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 25ff1aec-5945-4187-8218-fabc040fee51
X-Archives-Hash: b8bb7b3e5c5ad0d9f3a456223e00c945
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/=.*$/=/' \