commit: 55f38f43ec8b9562f5e48be2e8090ce20fc9b161
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 04:12:51 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 08:45:31 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f38f43
qt6-build.eclass: allow objects-* to be installed again
Being installed to /usr/lib*/objects- rather than under qt6/ feels
very out of place (haven't found a variable to change this), but
lacking this does break a few cmake files even though they are not
"essential" and on second thought decided to allow it again.
Will instead delete unwanted objects-* dirs that are installed only
when tests are enabled in their own ebuilds (turns there is not that
many). The original goal was to reduce the list of things each ebuilds
had to tidy up, but this did not help that much.
Won't revbump over this, if actually need these files (e.g. pyside)
consider this to be fixed in upcoming 6.8.3 instead.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
eclass/qt6-build.eclass | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index ae23f4e9bd82..1c13174804ad 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -203,11 +203,9 @@ qt6-build_src_install() {
_qt6-build_create_user_facing_links
- # hack: trim typical junk with currently no known "proper" way
- # to avoid that primarily happens with tests (e.g. qt5compat and
- # qtsvg tests, but qtbase[gui,-test] currently does some too)
- rm -rf -- "${D}${QT6_PREFIX}"/tests \
- "${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}" || die
+ # Qt often install unwanted files when tests are enabled and, while
+ # this does not cover everything, delete the common case.
+ rm -rf -- "${D}${QT6_PREFIX}"/tests || die
}
###### Public helpers ######
