commit: f6c788b3553a3ad73bf999f19ce0ffb34a32e760
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 13:08:46 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 16:41:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c788b3
dev-qt/qtwebengine: do the install sanity-check from qt5 in qt6 too
The check was removed before I touched these and didn't know it
existed. Was fair to think it wouldn't be needed anymore with cmake
but it is, e.g. it installs nothing if bison is not found without
hard failure.
File path is hopefully correct for Qt6, did give it two test builds
(one "bad" that's empty, and one full build) just in case. Albeit
haven't retried prefix (it's included in QT6_LIBDIR though).
The qt6-build eclass does force fatal errors for a few "build nothing"
cases, but not qtwebengine's custom ones. Kind of wonder if a similar
end result file check should be done for all of dev-qt/* (aka fail if
does not install anything but cmake files and docs). May revisit if Qt
has more original ways to build nothing not limited to qtwebengine.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 +++++++
4 files changed, 28 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 7557170168d7..52405bc44e44 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report
to https://bugs.gentoo.org/";
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 46450368b95d..a2fb38c98575 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report
to https://bugs.gentoo.org/";
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index c5e7a9912cc0..e7cca530e966 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report
to https://bugs.gentoo.org/";
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index c5e7a9912cc0..e7cca530e966 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report
to https://bugs.gentoo.org/";
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
