From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 362AE1382C5 for ; Wed, 7 Mar 2018 12:47:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19394E08E2; Wed, 7 Mar 2018 12:47:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC09DE08E2 for ; Wed, 7 Mar 2018 12:47:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E982B335C0A for ; Wed, 7 Mar 2018 12:47:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A99B3259 for ; Wed, 7 Mar 2018 12:47:23 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1520426833.c0679fd90abb0e90205754a2e41bcb3dc97e31e5.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c0679fd90abb0e90205754a2e41bcb3dc97e31e5 X-VCS-Branch: master Date: Wed, 7 Mar 2018 12:47:23 +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: 46071fa8-a309-4022-9faf-c6e6e5ba4b11 X-Archives-Hash: b06d89669e52da580ca504148b693f2f commit: c0679fd90abb0e90205754a2e41bcb3dc97e31e5 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Mar 3 03:15:19 2018 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Mar 7 12:47:13 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c0679fd9 qt5-build.eclass: Pass -platform option to configure on FreeBSD and Linux. Bug: https://bugs.gentoo.org/649406 eclass/qt5-build.eclass | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 12695141..3b961700 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qt5-build.eclass @@ -544,6 +544,23 @@ qt5_base_configure() { -examplesdir "${QT5_EXAMPLESDIR}" -testsdir "${QT5_TESTSDIR}" + # force appropriate compiler + if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then + $(if use kernel_FreeBSD; then + if tc-is-gcc; then + echo -platform freebsd-g++ + elif tc-is-clang; then + echo -platform freebsd-clang + fi + elif use kernel_linux; then + if tc-is-gcc; then + echo -platform linux-g++ + elif tc-is-clang; then + echo -platform linux-clang + fi + fi) + fi + # configure in release mode by default, # override via the CONFIG qmake variable -release