| 1 |
commit: f3a504e74a8b24fb181e766fad19bdf565896021 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 6 12:20:35 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 8 20:07:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a504e7 |
| 7 |
|
| 8 |
qt5-build.eclass: Drop obsolete pre-Qt-5.11 quirks |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 31 +++++++------------------------ |
| 13 |
1 file changed, 7 insertions(+), 24 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index ef104429f00..83f66220c73 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -80,26 +80,14 @@ case ${PV} in |
| 20 |
*_alpha*|*_beta*|*_rc*) |
| 21 |
# development release |
| 22 |
QT5_BUILD_TYPE="release" |
| 23 |
- |
| 24 |
- if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then |
| 25 |
- MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-} |
| 26 |
- else |
| 27 |
- MY_P=${QT5_MODULE}-opensource-src-${PV/_/-} |
| 28 |
- fi |
| 29 |
- |
| 30 |
+ MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-} |
| 31 |
SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz" |
| 32 |
S=${WORKDIR}/${MY_P} |
| 33 |
;; |
| 34 |
*) |
| 35 |
# official stable release |
| 36 |
QT5_BUILD_TYPE="release" |
| 37 |
- |
| 38 |
- if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then |
| 39 |
- MY_P=${QT5_MODULE}-everywhere-src-${PV} |
| 40 |
- else |
| 41 |
- MY_P=${QT5_MODULE}-opensource-src-${PV} |
| 42 |
- fi |
| 43 |
- |
| 44 |
+ MY_P=${QT5_MODULE}-everywhere-src-${PV} |
| 45 |
SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz" |
| 46 |
S=${WORKDIR}/${MY_P} |
| 47 |
;; |
| 48 |
@@ -535,13 +523,11 @@ qt5_base_configure() { |
| 49 |
echo -platform freebsd-clang |
| 50 |
fi |
| 51 |
fi) |
| 52 |
- $(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then |
| 53 |
- if use kernel_linux; then |
| 54 |
- if tc-is-gcc; then |
| 55 |
- echo -platform linux-g++ |
| 56 |
- elif tc-is-clang; then |
| 57 |
- echo -platform linux-clang |
| 58 |
- fi |
| 59 |
+ $(if use kernel_linux; then |
| 60 |
+ if tc-is-gcc; then |
| 61 |
+ echo -platform linux-g++ |
| 62 |
+ elif tc-is-clang; then |
| 63 |
+ echo -platform linux-clang |
| 64 |
fi |
| 65 |
fi) |
| 66 |
|
| 67 |
@@ -571,9 +557,6 @@ qt5_base_configure() { |
| 68 |
-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc |
| 69 |
-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds |
| 70 |
|
| 71 |
- # ensure the QML debugging support (qmltooling) is built in qtdeclarative |
| 72 |
- $([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug) |
| 73 |
- |
| 74 |
# MIPS DSP instruction set extensions |
| 75 |
$(is-flagq -mno-dsp && echo -no-mips_dsp) |
| 76 |
$(is-flagq -mno-dspr2 && echo -no-mips_dspr2) |
Archives