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 2CC46138010 for ; Sat, 20 Oct 2012 00:26:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61A52E02FB; Sat, 20 Oct 2012 00:26:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4458E02FB for ; Sat, 20 Oct 2012 00:26:34 +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 30B6233DB1D for ; Sat, 20 Oct 2012 00:26:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D1962E5436 for ; Sat, 20 Oct 2012 00:26:32 +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: <1350692406.8bdd3521512003e9f937f1529a4b46c6f7107617.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 8bdd3521512003e9f937f1529a4b46c6f7107617 X-VCS-Branch: master Date: Sat, 20 Oct 2012 00:26:32 +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: 69e5e8d2-eec7-4e0c-a401-bf7fbfc6e00b X-Archives-Hash: 66fe9efe952660d9165f911ac81c178d commit: 8bdd3521512003e9f937f1529a4b46c6f7107617 Author: Davide Pesavento gmail com> AuthorDate: Sat Oct 20 00:20:06 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Oct 20 00:20:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8bdd3521 [qt5-build.eclass] Fully respect user's *FLAGS. --- eclass/qt5-build.eclass | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 91ccd06..b8c72f9 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -180,11 +180,22 @@ qt5-build_src_prepare() { rm -f qmake/Makefile* fi + # Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables, + # or they will override user's flags (bug 427782) + sed -i -e '/^SYSTEM_VARIABLES=/ i \ + QMakeVar set QMAKE_CFLAGS_RELEASE\ + QMakeVar set QMAKE_CFLAGS_DEBUG\ + QMakeVar set QMAKE_CXXFLAGS_RELEASE\ + QMakeVar set QMAKE_CXXFLAGS_DEBUG\ + QMakeVar set QMAKE_LFLAGS_RELEASE\ + QMakeVar set QMAKE_LFLAGS_DEBUG\n' \ + configure || die "sed failed (QMAKE_*FLAGS_{RELEASE,DEBUG})" + # Respect CXX in configure sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)" - # Respect CC, CXX, LINK and *FLAGS in config.tests + # Respect toolchain and flags in config.tests # FIXME: in compile.test, -m flags are passed to the linker via LIBS find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \