diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-05 23:33:24 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-08 18:54:33 +0200 |
| commit | 8138f63798688fd1a8c3e00ba23a21397daf08bf (patch) | |
| tree | 3e34372811c84d6c18a28e2b81645148b1927072 /eclass | |
| parent | qt5-build.eclass: Always run qt5_tools_configure for QT5_MODULE=qttools (diff) | |
| download | gentoo-8138f63798688fd1a8c3e00ba23a21397daf08bf.tar.gz gentoo-8138f63798688fd1a8c3e00ba23a21397daf08bf.tar.bz2 gentoo-8138f63798688fd1a8c3e00ba23a21397daf08bf.zip | |
qt5-build.eclass: Introduce QT5_PV for intra-dev-qt deps
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 988dceb495f2..0cc45c596b3b 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -37,6 +37,12 @@ readonly QT5_BUILD_TYPE # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass. : ${QT5_MODULE:=${PN}} +# @ECLASS-VARIABLE: QT5_PV +# @DESCRIPTION: +# 3-component version for use in dependency declarations on other dev-qt/ pkgs. +QT5_PV=$(ver_cut 1-3) +readonly QT5_PV + # @ECLASS-VARIABLE: _QT5_P # @INTERNAL # @DESCRIPTION: @@ -109,7 +115,7 @@ BDEPEND=" virtual/pkgconfig " if [[ ${PN} != qttest ]]; then - DEPEND+=" test? ( ~dev-qt/qttest-$(ver_cut 1-3) )" + DEPEND+=" test? ( =dev-qt/qttest-${QT5_PV}* )" fi ###### Phase functions ###### @@ -127,7 +133,7 @@ qt5-build_src_prepare() { # 5.15.3 release is closed and this will never be more than a Qt 5.15.2 # with patches on top. einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" - sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf || die + sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die mkdir -p .git || die # need to fake a git repository for configure fi |