1 |
commit: bafd5b0b9e0a2678334355ee3547ebf09833749b |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 27 20:26:49 2018 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 27 20:26:49 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bafd5b0b |
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 |
|
21 |
eclass/qt5-build.eclass | 5 ----- |
22 |
1 file changed, 5 deletions(-) |
23 |
|
24 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
25 |
index 83f66220..c6c08a6b 100644 |
26 |
--- a/eclass/qt5-build.eclass |
27 |
+++ b/eclass/qt5-build.eclass |
28 |
@@ -178,11 +178,6 @@ qt5-build_src_prepare() { |
29 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
30 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
31 |
|
32 |
- # Don't inject -msse/-mavx/... into CXXFLAGS when detecting |
33 |
- # compiler support for extended instruction sets (bug 552942) |
34 |
- find config.tests/common -name '*.pro' -type f -execdir \ |
35 |
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die |
36 |
- |
37 |
# Don't add -O3 to CXXFLAGS (bug 549140) |
38 |
sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
39 |
src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |