commit:     c0679fd90abb0e90205754a2e41bcb3dc97e31e5
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Mar  3 03:15:19 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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

Reply via email to