[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

[Mike Gilbert]

commit:     bd7fe586d642e047d14c193950f883e0b7b17a6a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 17:41:59 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 17:41:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7fe586

sys-libs/db: call tc-ld-force-bfd before multilib code

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-libs/db/db-4.8.30-r8.ebuild | 9 ++++++---
 sys-libs/db/db-5.3.28-r9.ebuild | 8 ++++++--
 sys-libs/db/db-6.0.35-r4.ebuild | 8 ++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/sys-libs/db/db-4.8.30-r8.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild
index f5906a0c970e..7d3883eeb360 100644
--- a/sys-libs/db/db-4.8.30-r8.ebuild
+++ b/sys-libs/db/db-4.8.30-r8.ebuild
@@ -80,6 +80,12 @@ src_prepare() {
                -i configure || die
 }
 
+src_configure() {
+       # Force bfd before calling multilib_toolchain_setup
+       tc-ld-force-bfd #470634 #729510
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myconf=(
                --enable-compat185
@@ -93,9 +99,6 @@ multilib_src_configure() {
                $(use_enable test)
        )
 
-       # bug #470634 and bug #729510
-       tc-ld-force-bfd
-
        # compilation with -O0 fails on amd64, see bug #171231
        if [[ ${ABI} == amd64 ]]; then
                local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}

diff --git a/sys-libs/db/db-5.3.28-r9.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
index 1d029d38e96b..13da32d2e3bb 100644
--- a/sys-libs/db/db-5.3.28-r9.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -111,6 +111,12 @@ src_prepare() {
                -i "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
+src_configure() {
+       # Force bfd before calling multilib_toolchain_setup
+       tc-ld-force-bfd #470634 #729510
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myconf=(
                # sql_compat will cause a collision with sqlite3
@@ -132,8 +138,6 @@ multilib_src_configure() {
                $(use_enable test)
        )
 
-       tc-ld-force-bfd #470634 #729510
-
        # compilation with -O0 fails on amd64, see bug #171231
        if [[ ${ABI} == amd64 ]]; then
                local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 20268a5c9996..0ee187c58cea 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -104,6 +104,12 @@ src_prepare() {
                -i "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
+src_configure() {
+       # Force bfd before calling multilib_toolchain_setup
+       tc-ld-force-bfd #470634 #729510
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myconf=(
                --enable-compat185
@@ -121,8 +127,6 @@ multilib_src_configure() {
                $(use_enable test)
        )
 
-       tc-ld-force-bfd #470634 #729510
-
        # compilation with -O0 fails on amd64, see bug #171231
        if [[ ${ABI} == amd64 ]]; then
                local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}