From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-792319-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 89CC1138C48
for <garchives@archives.gentoo.org>; Sun, 12 Apr 2015 15:54:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 071AAE0913;
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 A4058E0913
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2015 15:54:46 +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 6FBA5340B1F
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2015 15:54:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 15ECA15C3A
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2015 15:54:42 +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: <1428850269.dbd1a5e07c634d3425c44a2191db0bacbbacf2db.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: dbd1a5e07c634d3425c44a2191db0bacbbacf2db
X-VCS-Branch: master
Date: Sun, 12 Apr 2015 15:54:42 +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: 16fb2257-3d28-4e06-85b3-3a02622681fc
X-Archives-Hash: 6bdc11fae419c5c96ba3df89b62a2731
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