| 1 |
commit: c5a8bc30c940374a54bac471f8c116c14448c9cf |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 30 20:35:12 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 1 08:50:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5a8bc30 |
| 7 |
|
| 8 |
qt5-build.eclass: Drop obsolete pre-Qt-5.14.2 quirks |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/676948 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/qt5-build.eclass | 10 ++-------- |
| 14 |
1 file changed, 2 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 17 |
index cd2e19b0..8531d129 100644 |
| 18 |
--- a/eclass/qt5-build.eclass |
| 19 |
+++ b/eclass/qt5-build.eclass |
| 20 |
@@ -104,11 +104,7 @@ EGIT_REPO_URI=( |
| 21 |
# @OUTPUT_VARIABLE |
| 22 |
# @DESCRIPTION: |
| 23 |
# Build directory for out-of-source builds. |
| 24 |
-if ver_test ${PV} -lt 5.14.2; then |
| 25 |
- : ${QT5_BUILD_DIR:=${S}} # workaround for bug 497312 |
| 26 |
-else |
| 27 |
- : ${QT5_BUILD_DIR:=${S}_build} |
| 28 |
-fi |
| 29 |
+: ${QT5_BUILD_DIR:=${S}_build} |
| 30 |
|
| 31 |
IUSE="debug test" |
| 32 |
|
| 33 |
@@ -663,9 +659,7 @@ qt5_base_configure() { |
| 34 |
# config to always be used. bug 599636 |
| 35 |
# ${S}/include does not exist in live sources |
| 36 |
local basedir="${S}/" |
| 37 |
- if ver_test ${PV} -lt 5.14.2 || [[ ${QT5_BUILD_TYPE} == live ]]; then |
| 38 |
- basedir="" |
| 39 |
- fi |
| 40 |
+ [[ ${QT5_BUILD_TYPE} == live ]] && basedir="" |
| 41 |
cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die |
| 42 |
|
| 43 |
popd >/dev/null || die |
Archives