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 DF673138CDB for ; Thu, 11 Jun 2015 17:47:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5CC0E0869; Thu, 11 Jun 2015 17:47:17 +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 4B3DFE0869 for ; Thu, 11 Jun 2015 17:47:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F37FF340CB1 for ; Thu, 11 Jun 2015 17:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22EFCA0C for ; Thu, 11 Jun 2015 17:47:12 +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: <1434044616.9843f6b6b71ca7b82c28685105a08a172e767c1c.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: 9843f6b6b71ca7b82c28685105a08a172e767c1c X-VCS-Branch: master Date: Thu, 11 Jun 2015 17:47:12 +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: 87cb8558-5935-437a-a5e9-2bcb770297df X-Archives-Hash: 15326630463f6b61337d82d43169e606 commit: 9843f6b6b71ca7b82c28685105a08a172e767c1c Author: Davide Pesavento gentoo org> AuthorDate: Thu Jun 11 17:43:36 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jun 11 17:43:36 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9843f6b6 [qt5-build] Disable instruction set when the corresponding flag is present. We now detect if the user disabled one or more instruction sets, and pass the corresponding -no-foo option to configure. Heavily based on commit 1dec9f625b40e91fcf680d8bfd80f8d876ea8ee5 that did the same for qt4-build-multilib.eclass. eclass/qt5-build.eclass | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 14fbb78..6f10824 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -321,14 +321,13 @@ qt5-build_pkg_postrm() { ###### Public helpers ###### # @FUNCTION: qt_use -# @USAGE: [feature] [enableopt] +# @USAGE: [feature] [enableval] # @DESCRIPTION: # is the name of a flag in IUSE. # -# Echoes "-${enableopt}-${feature}" if is enabled, or "-no-${feature}" -# if it is disabled. If [feature] is not specified, it defaults to the value -# of . If [enableopt] is not specified, the whole "-${enableopt}" prefix -# is omitted. +# Outputs "-${enableval}-${feature}" if is enabled, "-no-${feature}" +# otherwise. If [feature] is not specified, is used in its place. +# If [enableval] is not specified, the "-${enableval}" prefix is omitted. qt_use() { [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" @@ -517,6 +516,17 @@ qt5_base_configure() { # obsolete flag, does nothing #-qml-debug + # instruction set support + $(is-flagq -mno-sse2 && echo -no-sse2) + $(is-flagq -mno-sse3 && echo -no-sse3) + $(is-flagq -mno-ssse3 && echo -no-ssse3) + $(is-flagq -mno-sse4.1 && echo -no-sse4.1) + $(is-flagq -mno-sse4.2 && echo -no-sse4.2) + $(is-flagq -mno-avx && echo -no-avx) + $(is-flagq -mno-avx2 && echo -no-avx2) + $(is-flagq -mno-dsp && echo -no-mips_dsp) + $(is-flagq -mno-dspr2 && echo -no-mips_dspr2) + # use pkg-config to detect include and library paths -pkg-config