[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/

[Viorel Munteanu]

commit:     01aa99c744de0fb747cb665dea4a3865144acf0d
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 11:43:29 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 11:47:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01aa99c7

app-emulation/virtualbox: force bfd before exporting LDFLAGS

Move tc-ld-force-bfd and remove superfluous tc-ld-disable-gold.

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-emulation/virtualbox/virtualbox-6.1.50.ebuild | 8 +++-----
 app-emulation/virtualbox/virtualbox-7.0.14.ebuild | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-emulation/virtualbox/virtualbox-6.1.50.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.50.ebuild
index 61422efec0e9..3d11e6cbe0a5 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.50.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.50.ebuild
@@ -243,6 +243,9 @@ src_prepare() {
                        >> LocalConfig.kmk || die
        fi
 
+       # bug #916002, #488176
+       tc-ld-force-bfd
+
        # Respect LDFLAGS
        sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
                -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
@@ -271,8 +274,6 @@ src_prepare() {
 }
 
 src_configure() {
-       tc-ld-disable-gold # bug #488176
-
        #856811 #864274
        # cannot filter out only one flag, some combinations of these flags 
produce buggy executables
        for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
@@ -330,9 +331,6 @@ src_configure() {
        # bug #908814
        filter-lto
 
-       # bug #916002
-       tc-ld-force-bfd
-
        # bug #843437
        cat >> LocalConfig.kmk <<-EOF || die
                CXXFLAGS=${CXXFLAGS}

diff --git a/app-emulation/virtualbox/virtualbox-7.0.14.ebuild 
b/app-emulation/virtualbox/virtualbox-7.0.14.ebuild
index 7dc158723649..b45dfefcb861 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.14.ebuild
@@ -269,6 +269,9 @@ src_prepare() {
                        >> LocalConfig.kmk || die
        fi
 
+       # bug #916002, #488176
+       tc-ld-force-bfd
+
        # Respect LDFLAGS
        sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
                -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
@@ -303,9 +306,6 @@ src_prepare() {
        # bug #908814
        filter-lto
 
-       # bug #916002
-       tc-ld-force-bfd
-
        # bug #843437
        cat >> LocalConfig.kmk <<-EOF || die
                CXXFLAGS=${CXXFLAGS}
@@ -363,8 +363,6 @@ src_prepare() {
 }
 
 src_configure() {
-       tc-ld-disable-gold # bug #488176
-
        tc-export AR CC CXX LD RANLIB
        export HOST_CC="$(tc-getBUILD_CC)"