commit: 4512a456df71b4e9efb59b9952cc74ea565d9a03 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Mon Sep 11 13:10:37 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Sep 11 13:11:04 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4512a456
dev-qt/qtdeclarative: avoid runtime crashes when built with GCC 6 Gentoo-bug: 626070 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild | 8 +++++++- dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild | 8 +++++++- dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.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 \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.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 \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.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 \