| 1 |
commit: 9f5cfe5f4abb8e97ac0231301e6c0bdb31d21796 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 7 20:47:42 2019 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 7 20:47:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9f5cfe5f |
| 7 |
|
| 8 |
qt5-build.eclass: move the 's/optimize_full//' sed where it belongs |
| 9 |
|
| 10 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-qt/qtcore/qtcore-5.12.0.ebuild | 3 +++ |
| 13 |
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 3 +++ |
| 14 |
dev-qt/qtcore/qtcore-5.9999.ebuild | 3 +++ |
| 15 |
dev-qt/qtgui/qtgui-5.12.0.ebuild | 3 +++ |
| 16 |
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 3 +++ |
| 17 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 3 +++ |
| 18 |
eclass/qt5-build.eclass | 8 +++++--- |
| 19 |
7 files changed, 23 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild b/dev-qt/qtcore/qtcore-5.12.0.ebuild |
| 22 |
index a77edf08..2aa86f3a 100644 |
| 23 |
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild |
| 24 |
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild |
| 25 |
@@ -44,6 +44,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 26 |
) |
| 27 |
|
| 28 |
src_prepare() { |
| 29 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
| 30 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die |
| 31 |
+ |
| 32 |
# fix missing qt_version_tag symbol w/ LTO, bug 674382 |
| 33 |
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.12.9999.ebuild |
| 37 |
index a77edf08..2aa86f3a 100644 |
| 38 |
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild |
| 39 |
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild |
| 40 |
@@ -44,6 +44,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 41 |
) |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
| 45 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die |
| 46 |
+ |
| 47 |
# fix missing qt_version_tag symbol w/ LTO, bug 674382 |
| 48 |
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 52 |
index a77edf08..2aa86f3a 100644 |
| 53 |
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 54 |
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 55 |
@@ -44,6 +44,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 56 |
) |
| 57 |
|
| 58 |
src_prepare() { |
| 59 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
| 60 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die |
| 61 |
+ |
| 62 |
# fix missing qt_version_tag symbol w/ LTO, bug 674382 |
| 63 |
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die |
| 64 |
|
| 65 |
|
| 66 |
diff --git a/dev-qt/qtgui/qtgui-5.12.0.ebuild b/dev-qt/qtgui/qtgui-5.12.0.ebuild |
| 67 |
index a7e6c5ce..c8804eb3 100644 |
| 68 |
--- a/dev-qt/qtgui/qtgui-5.12.0.ebuild |
| 69 |
+++ b/dev-qt/qtgui/qtgui-5.12.0.ebuild |
| 70 |
@@ -123,6 +123,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 71 |
) |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
| 75 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 76 |
+ |
| 77 |
# egl_x11 is activated when both egl and xcb are enabled |
| 78 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 79 |
|
| 80 |
|
| 81 |
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 82 |
index 2d60029e..d0432526 100644 |
| 83 |
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 84 |
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 85 |
@@ -123,6 +123,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 86 |
) |
| 87 |
|
| 88 |
src_prepare() { |
| 89 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
| 90 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 91 |
+ |
| 92 |
# egl_x11 is activated when both egl and xcb are enabled |
| 93 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 94 |
|
| 95 |
|
| 96 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 97 |
index 2d60029e..d0432526 100644 |
| 98 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 99 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 100 |
@@ -123,6 +123,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 101 |
) |
| 102 |
|
| 103 |
src_prepare() { |
| 104 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
| 105 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 106 |
+ |
| 107 |
# egl_x11 is activated when both egl and xcb are enabled |
| 108 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 109 |
|
| 110 |
|
| 111 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 112 |
index c6c08a6b..d0a73287 100644 |
| 113 |
--- a/eclass/qt5-build.eclass |
| 114 |
+++ b/eclass/qt5-build.eclass |
| 115 |
@@ -178,9 +178,11 @@ qt5-build_src_prepare() { |
| 116 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
| 117 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
| 118 |
|
| 119 |
- # Don't add -O3 to CXXFLAGS (bug 549140) |
| 120 |
- sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
| 121 |
- src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |
| 122 |
+ if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then |
| 123 |
+ # Don't add -O3 to CXXFLAGS (bug 549140) |
| 124 |
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
| 125 |
+ src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |
| 126 |
+ fi |
| 127 |
|
| 128 |
# Respect build variables in configure tests (bug #639494) |
| 129 |
sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die |
Archives