summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2019-01-07 21:47:42 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-02-07 23:09:08 +0100
commit86a67cf32927d6528ebc3926e900910cdb598bef (patch)
treeeab1b382cdef69d4a3588693f777dea5d6c43892 /eclass
parentqt5-build.eclass: remove obsolete instruction sets workaround (diff)
downloadgentoo-86a67cf32927d6528ebc3926e900910cdb598bef.tar.gz
gentoo-86a67cf32927d6528ebc3926e900910cdb598bef.tar.bz2
gentoo-86a67cf32927d6528ebc3926e900910cdb598bef.zip
qt5-build.eclass: move the 's/optimize_full//' sed where it belongs
Signed-off-by: Davide Pesavento <pesa@gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt5-build.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c6c08a6bd03..d0a73287222 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,9 +178,11 @@ qt5-build_src_prepare() {
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
configure || die "sed failed (QMAKE_CONF_COMPILER)"
- # 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