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 748A9138CCE for ; Tue, 5 May 2015 17:26:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 088E2E08A4; Tue, 5 May 2015 17:26:57 +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 934FFE08A4 for ; Tue, 5 May 2015 17:26:56 +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 B8E593402FB for ; Tue, 5 May 2015 17:26:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F82D9AC for ; Tue, 5 May 2015 17:26:54 +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: <1430846682.1dec9f625b40e91fcf680d8bfd80f8d876ea8ee5.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 1dec9f625b40e91fcf680d8bfd80f8d876ea8ee5 X-VCS-Branch: master Date: Tue, 5 May 2015 17:26: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: 11b92200-1b0a-4b68-9161-3124665d3c7a X-Archives-Hash: 6784db25f54710db5a478fc4f75623ce commit: 1dec9f625b40e91fcf680d8bfd80f8d876ea8ee5 Author: Davide Pesavento gentoo org> AuthorDate: Tue May 5 16:55:39 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue May 5 17:24:42 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1dec9f62 [qt4-build-multilib] Disable instruction set when the corresponding flag is present This wasn't necessary until now because the user's flags were overriding the additional -mfoo flag passed from configure to compile.test. However we will soon stop substituting the flags directly in compile.test because that doesn't work in the multilib case, and there is no other feasible way to have the user's flags take precedence over the appended ones during the configure tests. Therefore we now detect if the user disabled one or more instruction sets, and pass the corresponding -no-foo option to configure. Credit to kensington for the idea. eclass/qt4-build-multilib.eclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 9a758e4..2c4de88 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -339,6 +339,18 @@ qt4_multilib_src_configure() { -arch ${arch} -platform $(qt4_get_mkspec) + # instruction set support + $(is-flagq -mno-mmx && echo -no-mmx) + $(is-flagq -mno-3dnow && echo -no-3dnow) + $(is-flagq -mno-sse && echo -no-sse) + $(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 -mfpu=* && ! is-flagq -mfpu=*neon* && echo -no-neon) + # prefer system libraries -system-zlib