| 1 |
commit: ecd44b7ea14e4b92d8de94058987b1cd3e52f9ce |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 21 21:35:30 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 21 21:35:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecd44b7e |
| 7 |
|
| 8 |
qt5-build.eclass: sync with gentoo repo |
| 9 |
|
| 10 |
eclass/qt5-build.eclass | 34 +++++++++++++++++++--------------- |
| 11 |
1 file changed, 19 insertions(+), 15 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 14 |
index 9f8eabb..c5eb32b 100644 |
| 15 |
--- a/eclass/qt5-build.eclass |
| 16 |
+++ b/eclass/qt5-build.eclass |
| 17 |
@@ -58,8 +58,6 @@ QT5_MINOR_VERSION=$(get_version_component_range 2) |
| 18 |
readonly QT5_MINOR_VERSION |
| 19 |
|
| 20 |
if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
| 21 |
- # IMPORTANT: add a subslot dependency to your package only if you are sure |
| 22 |
- # that it uses some private Qt APIs (most likely it does not) |
| 23 |
SLOT=5/$(get_version_component_range 1-2) |
| 24 |
else |
| 25 |
SLOT=5 |
| 26 |
@@ -196,13 +194,19 @@ qt5-build_src_prepare() { |
| 27 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
| 28 |
|
| 29 |
# Respect toolchain and flags in config.tests |
| 30 |
- find config.tests/unix -name '*.test' -type f \ |
| 31 |
- -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \ |
| 32 |
- || die "sed failed (config.tests)" |
| 33 |
+ find config.tests/unix -name '*.test' -type f -execdir \ |
| 34 |
+ sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die |
| 35 |
|
| 36 |
# Don't add -O3 to CXXFLAGS (bug 549140) |
| 37 |
sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
| 38 |
src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |
| 39 |
+ |
| 40 |
+ # Don't inject -msse/-mavx/... into CXXFLAGS when detecting |
| 41 |
+ # compiler support for extended instruction sets (bug 552942) |
| 42 |
+ if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then |
| 43 |
+ find config.tests/common -name '*.pro' -type f -execdir \ |
| 44 |
+ sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die |
| 45 |
+ fi |
| 46 |
fi |
| 47 |
|
| 48 |
if [[ ${EAPI} == 5 ]]; then |
| 49 |
@@ -536,16 +540,16 @@ qt5_base_configure() { |
| 50 |
# obsolete flag, does nothing |
| 51 |
#-qml-debug |
| 52 |
|
| 53 |
- # instruction set support |
| 54 |
- $(is-flagq -mno-sse2 && echo -no-sse2) |
| 55 |
- $(is-flagq -mno-sse3 && echo -no-sse3) |
| 56 |
- $(is-flagq -mno-ssse3 && echo -no-ssse3) |
| 57 |
- $(is-flagq -mno-sse4.1 && echo -no-sse4.1) |
| 58 |
- $(is-flagq -mno-sse4.2 && echo -no-sse4.2) |
| 59 |
- $(is-flagq -mno-avx && echo -no-avx) |
| 60 |
- $(is-flagq -mno-avx2 && echo -no-avx2) |
| 61 |
- $(is-flagq -mno-dsp && echo -no-mips_dsp) |
| 62 |
- $(is-flagq -mno-dspr2 && echo -no-mips_dspr2) |
| 63 |
+ # extended instruction sets support |
| 64 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2 && echo -no-sse2) |
| 65 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3 && echo -no-sse3) |
| 66 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3 && echo -no-ssse3) |
| 67 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && echo -no-sse4.1) |
| 68 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && echo -no-sse4.2) |
| 69 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx && echo -no-avx) |
| 70 |
+ $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx2 && echo -no-avx2) |
| 71 |
+ $(is-flagq -mno-dsp && echo -no-mips_dsp) |
| 72 |
+ $(is-flagq -mno-dspr2 && echo -no-mips_dspr2) |
| 73 |
|
| 74 |
# use pkg-config to detect include and library paths |
| 75 |
-pkg-config |
Archives