commit: f743270fbbe4e084be0f1496cbbcc6cb2fcaed85
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 15:28:04 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 15:28:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f743270f
dev-qt/qtdeclarative: apply forgotten changes to 5.10.9999
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
index 23c47148..c6957999 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit python-any-r1 qt5-build
+inherit flag-o-matic python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
@@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND}
"
src_prepare() {
+ # this is supposed to be handled by the build system (src/qml/qml.pro),
+ # fails because we override QMAKE_CXXFLAGS. bug 626070
+ if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then
+ append-cxxflags -fno-delete-null-pointer-checks
-fno-lifetime-dse
+ fi
+
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
qt_use_disable_mod localstorage sql \
