diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39606 -> 39599 bytes | |||
| -rw-r--r-- | eclass/qt6-build.eclass | 25 |
2 files changed, 18 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex f0277d652357..bb0700eaff54 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 59baaa77ce6d..4fc838c478af 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -23,6 +23,13 @@ _QT6_BUILD_ECLASS=1 inherit cmake flag-o-matic toolchain-funcs +# @ECLASS_VARIABLE: QT6_BUILD_TYPE +# @DESCRIPTION: +# Read only variable set based on PV to one of: +# - release: official 6.x.x releases +# - pre-release: development 6.x.x_rc/beta/alpha releases +# - live: *.9999 (dev branch), 6.x.9999 (stable branch) + # @ECLASS_VARIABLE: QT6_MODULE # @PRE_INHERIT # @DESCRIPTION: @@ -30,12 +37,14 @@ inherit cmake flag-o-matic toolchain-funcs # Used for SRC_URI and EGIT_REPO_URI. : "${QT6_MODULE:=${PN}}" -# @ECLASS_VARIABLE: QT6_BUILD_TYPE +# @ECLASS_VARIABLE: QT6_RESTRICT_TESTS +# @DEFAULT_UNSET +# @PRE_INHERIT # @DESCRIPTION: -# Read only variable set based on PV to one of: -# - release: official 6.x.x releases -# - pre-release: development 6.x.x_rc/beta/alpha releases -# - live: *.9999 (dev branch), 6.x.9999 (stable branch) +# If set to a non-empty value, will not add IUSE="test" and set +# RESTRICT="test" instead. Primarily intended for ebuilds where +# running tests is unmaintained (or missing) rather than just +# temporarily restricted not to have a broken USE (bug #930266). if [[ ${PV} == *.9999 ]]; then inherit git-r3 @@ -68,7 +77,9 @@ HOMEPAGE="https://www.qt.io/" LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" SLOT=6/${PV%%_*} -if [[ ${PN} != qttranslations ]]; then +if [[ ${QT6_RESTRICT_TESTS} ]]; then + RESTRICT="test" +else IUSE="test" RESTRICT="!test? ( test )" fi @@ -139,7 +150,7 @@ qt6-build_src_configure() { # see _qt6-build_create_user_facing_links -DINSTALL_PUBLICBINDIR="${QT6_PREFIX}"/bin # note that if qtbase was built with tests, this is default ON - -DQT_BUILD_TESTS=$(usex test ON OFF) + -DQT_BUILD_TESTS=$(in_iuse test && use test && echo ON || echo OFF) # avoid appending -O2 after user's C(XX)FLAGS (bug #911822) -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON ) |