diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
| commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
| tree | cee0a97398040001220ece3cd48c3d568bcddb4a /eclass/qt5-build.eclass | |
| parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) | |
gentoo resync : 10.02.2019
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 83f66220c735..d0a73287222e 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -178,14 +178,11 @@ qt5-build_src_prepare() { sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)" - # Don't inject -msse/-mavx/... into CXXFLAGS when detecting - # compiler support for extended instruction sets (bug 552942) - find config.tests/common -name '*.pro' -type f -execdir \ - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || 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)" + if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then + # 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)" + fi # Respect build variables in configure tests (bug #639494) sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die |