commit:     3d29494e273481027c03ce37785895241e21c6fd
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 13:30:56 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 13:32:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d29494e

app-emulation/virtualbox: fix linking with mold

Bug: https://bugs.gentoo.org/925347
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../files/virtualbox-7.1.0_beta1-link-with-mold.patch       | 13 +++++++++++++
 app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild      |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git 
a/app-emulation/virtualbox/files/virtualbox-7.1.0_beta1-link-with-mold.patch 
b/app-emulation/virtualbox/files/virtualbox-7.1.0_beta1-link-with-mold.patch
new file mode 100644
index 000000000000..71e3edb26b3c
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.1.0_beta1-link-with-mold.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/925347
+
+--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
++++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
+@@ -1669,7 +1669,7 @@
+ # The Qt modules we're using.
+ # (The include directory and lib/framework for each module will be added by 
the Qt unit.)
+ #
+-UICommon_QT_MODULES = Core Gui Widgets Help StateMachine
++UICommon_QT_MODULES = Core Gui Widgets Help PrintSupport StateMachine
+ ifdef VBOX_WITH_SCREENSAVER_CONTROL
+  UICommon_QT_MODULES.linux    += DBus
+  UICommon_QT_MODULES.linux    += Xml

diff --git a/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild 
b/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
index cc9921a521ed..40cc4cfebb03 100644
--- a/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
@@ -195,6 +195,7 @@ REQUIRED_USE="
 PATCHES=(
        # Downloaded patchset
        "${WORKDIR}"/virtualbox-patches-7.1.0_beta1/patches
+       "${FILESDIR}"/${P}-link-with-mold.patch
 )
 
 DOCS=()        # Don't install the default README file during einstalldocs
@@ -251,8 +252,8 @@ src_prepare() {
                        >> LocalConfig.kmk || die
        fi
 
-       # bug #916002, #488176
-       tc-ld-force-bfd
+       # bug #916002, #488176, #925347
+       tc-ld-is-mold || tc-ld-force-bfd
 
        # Respect LDFLAGS
        sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \

Reply via email to