| 1 |
commit: 4512a456df71b4e9efb59b9952cc74ea565d9a03 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 11 13:10:37 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 11 13:11:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4512a456 |
| 7 |
|
| 8 |
dev-qt/qtdeclarative: avoid runtime crashes when built with GCC 6 |
| 9 |
|
| 10 |
Gentoo-bug: 626070 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 12 |
|
| 13 |
dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild | 8 +++++++- |
| 14 |
dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild | 8 +++++++- |
| 15 |
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 8 +++++++- |
| 16 |
3 files changed, 21 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild |
| 19 |
index 23c47148..c6957999 100644 |
| 20 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild |
| 21 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild |
| 22 |
@@ -3,7 +3,7 @@ |
| 23 |
|
| 24 |
EAPI=6 |
| 25 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 26 |
-inherit python-any-r1 qt5-build |
| 27 |
+inherit flag-o-matic python-any-r1 qt5-build |
| 28 |
|
| 29 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 30 |
|
| 31 |
@@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} |
| 32 |
" |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
+ # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 36 |
+ # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 37 |
+ if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 38 |
+ append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 42 |
|
| 43 |
qt_use_disable_mod localstorage sql \ |
| 44 |
|
| 45 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild |
| 46 |
index 23c47148..c6957999 100644 |
| 47 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild |
| 48 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild |
| 49 |
@@ -3,7 +3,7 @@ |
| 50 |
|
| 51 |
EAPI=6 |
| 52 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 53 |
-inherit python-any-r1 qt5-build |
| 54 |
+inherit flag-o-matic python-any-r1 qt5-build |
| 55 |
|
| 56 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 57 |
|
| 58 |
@@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} |
| 59 |
" |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
+ # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 63 |
+ # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 64 |
+ if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 65 |
+ append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 69 |
|
| 70 |
qt_use_disable_mod localstorage sql \ |
| 71 |
|
| 72 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 73 |
index 23c47148..c6957999 100644 |
| 74 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 75 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 76 |
@@ -3,7 +3,7 @@ |
| 77 |
|
| 78 |
EAPI=6 |
| 79 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 80 |
-inherit python-any-r1 qt5-build |
| 81 |
+inherit flag-o-matic python-any-r1 qt5-build |
| 82 |
|
| 83 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 84 |
|
| 85 |
@@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} |
| 86 |
" |
| 87 |
|
| 88 |
src_prepare() { |
| 89 |
+ # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 90 |
+ # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 91 |
+ if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 92 |
+ append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 93 |
+ fi |
| 94 |
+ |
| 95 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 96 |
|
| 97 |
qt_use_disable_mod localstorage sql \ |
Archives