aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-06 13:20:35 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-06 20:49:19 +0100
commit7ffe15fefa8bb25be58249827d3bce997d9b4a51 (patch)
tree48e566d3988867d6a2676d5f01b44fea00f13eab
parentdev-qt: Drop 5.9 stable branch (diff)
downloadqt-7ffe15fefa8bb25be58249827d3bce997d9b4a51.tar.gz
qt-7ffe15fefa8bb25be58249827d3bce997d9b4a51.tar.bz2
qt-7ffe15fefa8bb25be58249827d3bce997d9b4a51.zip
qt5-build.eclass: Drop obsolete pre-Qt-5.11 quirks
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--eclass/qt5-build.eclass31
1 files changed, 7 insertions, 24 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ef104429..83f66220 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -80,26 +80,14 @@ case ${PV} in
*_alpha*|*_beta*|*_rc*)
# development release
QT5_BUILD_TYPE="release"
-
- if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
- MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
- else
- MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
- fi
-
+ MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
;;
*)
# official stable release
QT5_BUILD_TYPE="release"
-
- if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
- MY_P=${QT5_MODULE}-everywhere-src-${PV}
- else
- MY_P=${QT5_MODULE}-opensource-src-${PV}
- fi
-
+ MY_P=${QT5_MODULE}-everywhere-src-${PV}
SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
;;
@@ -535,13 +523,11 @@ qt5_base_configure() {
echo -platform freebsd-clang
fi
fi)
- $(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
- if use kernel_linux; then
- if tc-is-gcc; then
- echo -platform linux-g++
- elif tc-is-clang; then
- echo -platform linux-clang
- fi
+ $(if use kernel_linux; then
+ if tc-is-gcc; then
+ echo -platform linux-g++
+ elif tc-is-clang; then
+ echo -platform linux-clang
fi
fi)
@@ -571,9 +557,6 @@ qt5_base_configure() {
-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
- # ensure the QML debugging support (qmltooling) is built in qtdeclarative
- $([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug)
-
# MIPS DSP instruction set extensions
$(is-flagq -mno-dsp && echo -no-mips_dsp)
$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)