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 B47C81391DB for ; Mon, 28 Jul 2014 21:22:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5209FE0CDF; Mon, 28 Jul 2014 21:22:34 +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 E5091E0CDF for ; Mon, 28 Jul 2014 21:22:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16A6A340001 for ; Mon, 28 Jul 2014 21:22:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id DCED318BF0 for ; Mon, 28 Jul 2014 21:22: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: <1406581962.20364fbfaf7c53dfac2401cae0c8c20914dbe230.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: 20364fbfaf7c53dfac2401cae0c8c20914dbe230 X-VCS-Branch: master Date: Mon, 28 Jul 2014 21:22: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: c81e8bdd-e81b-4221-b468-a42968ac90fc X-Archives-Hash: 2141210614dd22d64b73414cc073752b commit: 20364fbfaf7c53dfac2401cae0c8c20914dbe230 Author: Uwe L. Korn xhochy com> AuthorDate: Sat Mar 8 12:00:27 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Jul 28 21:12:42 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=20364fbf [qt5-build.eclass] Set correct flags and toolchain in qt5_qmake. Fixes bug #490254. --- eclass/qt5-build.eclass | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index e6c20ec..1855d18 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -184,17 +184,6 @@ qt5-build_src_prepare() { sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)" - # 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)" @@ -577,7 +566,28 @@ qt5_base_configure() { qt5_qmake() { local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} - "${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" "$@" \ + "${QT5_BUILD_DIR}"/bin/qmake \ + QMAKE_AR="$(tc-getAR) cqs" \ + QMAKE_CC="$(tc-getCC)" \ + QMAKE_LINK_C="$(tc-getCC)" \ + QMAKE_LINK_C_SHLIB="$(tc-getCC)" \ + QMAKE_CXX="$(tc-getCXX)" \ + QMAKE_LINK="$(tc-getCXX)" \ + QMAKE_LINK_SHLIB="$(tc-getCXX)" \ + QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ + QMAKE_RANLIB= \ + QMAKE_STRIP="$(tc-getSTRIP)" \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= \ + "${projectdir}" \ + "$@" \ || die "qmake failed (${projectdir})" }