summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2017-03-01 18:26:30 +0200
committerMichael Palimaka <kensington@gentoo.org>2017-10-08 12:46:23 +1100
commit442e76a602d125c6d1d67223ea85c2b8b4c19e40 (patch)
tree301cf019c831d05cb612dc3a5f0d3c8eca7f62ac /eclass
parentqt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later (diff)
downloadgentoo-442e76a602d125c6d1d67223ea85c2b8b4c19e40.tar.gz
gentoo-442e76a602d125c6d1d67223ea85c2b8b4c19e40.tar.bz2
gentoo-442e76a602d125c6d1d67223ea85c2b8b4c19e40.zip
qt5-build.eclass: Fix qtbase configure for {5,5.8}.9999
Upstream has removed an "unused Xlib's XRender dependency", which results into live and future packages failing during their configure phases due to an unknown command line option (-xrender or -no-xrender). http://code.qt.io/cgit/qt/qtbase.git/commit/?id=d37c353dc0f2ae5bb803fe9e5752eff846246439
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt5-build.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 62c79d096285..6f46b2e7b8d4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -639,7 +639,9 @@ qt5_base_configure() {
# disable undocumented X11-related flags, override in qtgui
# (not shown in ./configure -help output)
- -no-xkb -no-xrender
+ -no-xkb
+ $([[ ${QT5_MINOR_VERSION} -lt 8 || ${QT5_MINOR_VERSION} -eq 8
+ && ${QT5_PATCH_VERSION} -lt 1 ]] && echo -no-xrender)
# disable obsolete/unused X11-related flags
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)