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 A1CCE1388C0 for ; Sun, 21 Feb 2016 21:36:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F39F21C082; Sun, 21 Feb 2016 21:36:14 +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 7A72621C082 for ; Sun, 21 Feb 2016 21:36:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81F75340B92 for ; Sun, 21 Feb 2016 21:36:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8F0A16C6 for ; Sun, 21 Feb 2016 21:36:08 +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: <1456090530.ecd44b7ea14e4b92d8de94058987b1cd3e52f9ce.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: ecd44b7ea14e4b92d8de94058987b1cd3e52f9ce X-VCS-Branch: master Date: Sun, 21 Feb 2016 21:36:08 +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: 99a5708a-670c-4cf5-b201-1a0292814728 X-Archives-Hash: 434b7e3a134e7f4be8d15285b1106196 commit: ecd44b7ea14e4b92d8de94058987b1cd3e52f9ce Author: Davide Pesavento gentoo org> AuthorDate: Sun Feb 21 21:35:30 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Feb 21 21:35:30 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecd44b7e qt5-build.eclass: sync with gentoo repo eclass/qt5-build.eclass | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 9f8eabb..c5eb32b 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -58,8 +58,6 @@ QT5_MINOR_VERSION=$(get_version_component_range 2) readonly QT5_MINOR_VERSION if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then - # IMPORTANT: add a subslot dependency to your package only if you are sure - # that it uses some private Qt APIs (most likely it does not) SLOT=5/$(get_version_component_range 1-2) else SLOT=5 @@ -196,13 +194,19 @@ qt5-build_src_prepare() { configure || die "sed failed (QMAKE_CONF_COMPILER)" # Respect toolchain and flags in config.tests - find config.tests/unix -name '*.test' -type f \ - -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \ - || die "sed failed (config.tests)" + find config.tests/unix -name '*.test' -type f -execdir \ + sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die # Don't add -O3 to CXXFLAGS (bug 549140) sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" + + # Don't inject -msse/-mavx/... into CXXFLAGS when detecting + # compiler support for extended instruction sets (bug 552942) + if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then + find config.tests/common -name '*.pro' -type f -execdir \ + sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die + fi fi if [[ ${EAPI} == 5 ]]; then @@ -536,16 +540,16 @@ 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) + # extended instruction sets support + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2 && echo -no-sse2) + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3 && echo -no-sse3) + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3 && echo -no-ssse3) + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && echo -no-sse4.1) + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && echo -no-sse4.2) + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx && echo -no-avx) + $([[ ${QT5_MINOR_VERSION} -le 4 ]] && 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