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 8AF271382C5 for ; Sat, 10 Mar 2018 01:55:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2DC4E07D1; Sat, 10 Mar 2018 01:55:56 +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 7F463E07D1 for ; Sat, 10 Mar 2018 01:55:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8CD11335C2A for ; Sat, 10 Mar 2018 01:55:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D9A221D for ; Sat, 10 Mar 2018 01:55:54 +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: <1520646944.2387fb8372d617c08ad5a63404c1699cd0a0d3b5.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: 2387fb8372d617c08ad5a63404c1699cd0a0d3b5 X-VCS-Branch: master Date: Sat, 10 Mar 2018 01:55:54 +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: 30046ec1-3758-4448-821a-a7bb3cb2e35f X-Archives-Hash: 3ce89b032b08a4a09a0804ba9092a91c commit: 2387fb8372d617c08ad5a63404c1699cd0a0d3b5 Author: Michael Palimaka gentoo org> AuthorDate: Sat Mar 10 01:54:38 2018 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Mar 10 01:55:44 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2387fb83 qt5-build.eclass: remove version conditional for passing -platform on freebsd Bug: https://bugs.gentoo.org/649406 eclass/qt5-build.eclass | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0e7111b5..2f95c64e 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -545,14 +545,15 @@ qt5_base_configure() { -testsdir "${QT5_TESTSDIR}" # force appropriate compiler + if use kernel_FreeBSD; then + if tc-is-gcc; then + echo -platform freebsd-g++ + elif tc-is-clang; then + echo -platform freebsd-clang + fi + fi $(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 use kernel_linux; then if tc-is-gcc; then echo -platform linux-g++ elif tc-is-clang; then