| 1 |
commit: 35ec5628b90bdc7ad6bb8ccc9e603100ad642cd9 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 27 20:26:49 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 7 22:08:58 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ec5628 |
| 7 |
|
| 8 |
qt5-build.eclass: remove obsolete instruction sets workaround |
| 9 |
|
| 10 |
This has seemingly been broken since 2017-08-02, where things |
| 11 |
were moved around [1], and now causes build failures as the |
| 12 |
directory has been removed completely [2]. |
| 13 |
|
| 14 |
1. https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f54f7d84 |
| 15 |
2. https://code.qt.io/cgit/qt/qtbase.git/commit/?id=73b87697 |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/552942 |
| 18 |
Bug: https://bugs.gentoo.org/672946 |
| 19 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 20 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 21 |
|
| 22 |
eclass/qt5-build.eclass | 5 ----- |
| 23 |
1 file changed, 5 deletions(-) |
| 24 |
|
| 25 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 26 |
index 83f66220c73..c6c08a6bd03 100644 |
| 27 |
--- a/eclass/qt5-build.eclass |
| 28 |
+++ b/eclass/qt5-build.eclass |
| 29 |
@@ -178,11 +178,6 @@ qt5-build_src_prepare() { |
| 30 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
| 31 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
| 32 |
|
| 33 |
- # Don't inject -msse/-mavx/... into CXXFLAGS when detecting |
| 34 |
- # compiler support for extended instruction sets (bug 552942) |
| 35 |
- find config.tests/common -name '*.pro' -type f -execdir \ |
| 36 |
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die |
| 37 |
- |
| 38 |
# Don't add -O3 to CXXFLAGS (bug 549140) |
| 39 |
sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
| 40 |
src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |
Archives