From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SRVVY-0001eX-7F for garchives@archives.gentoo.org; Mon, 07 May 2012 21:30:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D4B6E0AEB; Mon, 7 May 2012 21:30:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E2952E0AEB for ; Mon, 7 May 2012 21:30:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09E981B4041 for ; Mon, 7 May 2012 21:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 697FBE542D for ; Mon, 7 May 2012 21:30:04 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1336426176.d29e8ece2004453c1da720417ba779476d72ffc9.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: d29e8ece2004453c1da720417ba779476d72ffc9 X-VCS-Branch: master Date: Mon, 7 May 2012 21:30:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4374004c-2de7-4f69-99f2-821a1b1bfe9d X-Archives-Hash: d2e9d1b1126739e2fb456b415c1d2f33 commit: d29e8ece2004453c1da720417ba779476d72ffc9 Author: Davide Pesavento gmail com> AuthorDate: Mon May 7 21:29:36 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon May 7 21:29:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Dd29e8ece [qt4-build.eclass] Sync with portage. --- eclass/qt4-build.eclass | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index b5cfb47..be72e71 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.126 2012/= 04/25 17:43:50 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/= 05/07 21:28:01 pesa Exp $ =20 # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -283,8 +283,10 @@ qt4-build_src_prepare() { 'QMAKE_CFLAGS+=3D${CFLAGS}' 'QMAKE_CXXFLAGS+=3D${CXXFLAGS}' 'QMAKE_LF= LAGS+=3D${LDFLAGS}'&:" \ || die "sed config.tests failed" =20 - # Strip predefined CFLAGS from mkspecs (bug 312689) - sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=3D.*:+=3D:' mkspecs/common/g++.co= nf || die + if ! version_is_at_least 4.8; then + # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778) + sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=3D.*:+=3D:' mkspecs/common/g++.c= onf || die + fi =20 # Bug 172219 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die