From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E37A51381F3 for ; Mon, 14 Oct 2013 17:33:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77470E0B08; Mon, 14 Oct 2013 17:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAD6BE0B08 for ; Mon, 14 Oct 2013 17:33:32 +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 15C1E33EEAE for ; Mon, 14 Oct 2013 17:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BE3A5E545D for ; Mon, 14 Oct 2013 17:33:30 +0000 (UTC) From: "Davide Pesavento" 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" Message-ID: <1381771976.7506779fe45bbbf3c2ba924d66c108a91fc82994.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: 7506779fe45bbbf3c2ba924d66c108a91fc82994 X-VCS-Branch: master Date: Mon, 14 Oct 2013 17:33:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 601360d0-f42d-4711-9dfb-a3f836050049 X-Archives-Hash: d6557ea3e124419280e3fe2f438275fd commit: 7506779fe45bbbf3c2ba924d66c108a91fc82994 Author: Davide Pesavento gmail com> AuthorDate: Mon Oct 14 17:32:56 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Oct 14 17:32:56 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7506779f [qt4-build.eclass] Sync with portage. --- eclass/qt4-build.eclass | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 1fce381..3162f18 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.152 2013/10/14 17:29:55 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -103,6 +103,8 @@ qt4-build_src_unpack() { if ! version_is_at_least 4.1 $(gcc-version); then ewarn "Using a GCC version lower than 4.1 is not supported." + elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then + ewarn "USE=c++0x requires GCC 4.4 or later." fi if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then @@ -163,7 +165,7 @@ qt4-build_src_prepare() { fi # avoid X11 dependency in non-gui packages - local nolibx11_pkgs="qtcore qtdbus qtscript qtsql qttest qtxmlpatterns" + local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns" has ${PN} ${nolibx11_pkgs} && qt_nolibx11 if use aqua; then @@ -181,37 +183,27 @@ qt4-build_src_prepare() { symlink_binaries_to_buildtree fi - if [[ ${CHOST} == *86*-apple-darwin* ]]; then - # qmake bus errors with -O2 or -O3 but -O1 works - # Bug 373061 - replace-flags -O[23] -O1 - fi - - # Bug 178652 - if [[ $(gcc-major-version) == 3 ]] && use amd64; then - ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" - append-flags -fno-gcse - fi - if use_if_iuse c++0x; then append-cxxflags -std=c++0x fi - # Unsupported old gcc versions - hardened needs this :( - if [[ $(gcc-major-version) -lt 4 ]]; then - ewarn "Appending -fno-stack-protector to CXXFLAGS" - append-cxxflags -fno-stack-protector - # Bug 253127 - sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ - -i mkspecs/common/g++.conf || die - fi - # Bug 261632 if use ppc64; then - ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" append-flags -mminimal-toc fi + # Bug 373061 + # qmake bus errors with -O2 or -O3 but -O1 works + if [[ ${CHOST} == *86*-apple-darwin* ]]; then + replace-flags -O[23] -O1 + fi + + # Bug 417105 + # graphite on gcc 4.7 causes miscompilations + if [[ $(gcc-version) == "4.7" ]]; then + filter-flags -fgraphite-identity + fi + # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache sed -e "/^SYSTEM_VARIABLES=/i \ CC='$(tc-getCC)'\n\