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

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Mike Gilbert
2023-11-04 13:41:59 -04:00
parent 3dae41abc9
commit bd7fe586d6
3 changed files with 18 additions and 7 deletions
+6 -3
View File
@@ -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}
+6 -2
View File
@@ -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}"
+6 -2
View File
@@ -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}