gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

Revert "eclass/tests: tweak dot-a.sh tests for binutils"

Browse Source 
This reverts commit 89468b4dc0cf1ac417a1f3fb499693dc0c86e2fa. This is
now needed after 9b383903e73cd01f2fbe9728d0c31fea765ba8d6 in binutils,
which is great news, as strip Does The Right Thing in even more cases now.

Tweaked the versions accordingly.

Bug: https://sourceware.org/PR33271
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2025-08-15 06:14:16 +01:00
parent 2112b8c0b0
commit 77a958258a
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
eclass/tests/dot-a.sh
View File

@ -9,6 +9,45 @@ source version-funcs.sh || exit
inherit dot-a
_strip_is_gnu() {
local name=$($(tc-getSTRIP) --version 2>&1 | head -n 1)
if ! [[ ${name} =~ ^GNU.*strip ]] ; then
return 1
fi
return 0
}
_check_binutils_version() {
local tool=$1
# Convert this:
# ```
# GNU ld (Gentoo 2.38 p4) 2.38
# Copyright (C) 2022 Free Software Foundation, Inc.
# This program is free software; you may redistribute it under the terms of
# the GNU General Public License version 3 or (at your option) a later version.
# This program has absolutely no warranty.
# ```
#
# into...
# ```
# 2.38
# ```
local ver=$(${tool} --version 2>&1 | head -n 1 | rev | cut -d' ' -f1 | rev)
if ! [[ ${ver} =~ [0-9].[0-9][0-9](.[0-9]?) ]] ; then
# Skip if unrecognised format so we don't pass something
# odd into ver_cut.
return
fi
ver_major=$(ver_cut 1 "${ver}")
ver_minor=$(ver_cut 2 "${ver}")
ver_extra=$(ver_cut 3 "${ver}")
echo ${ver_major}.${ver_minor}${ver_extra:+.${ver_extra}}
}
_create_test_progs() {
cat <<-EOF > a.c
int foo();
@ -115,6 +154,10 @@ test_strip_lto_bytecode() {
# strip-lto-bytecode will error out early with LLVM,
# so stop the test here.
tc-is-clang && return 0
# strip with >= GNU Binutils 2.46 won't corrupt the archive:
# https://sourceware.org/PR21479
# https://sourceware.org/PR33271
_strip_is_gnu && ver_test $(_check_binutils_version $(tc-getSTRIP)) -gt 2.45 && return 0
$(tc-getCC) ${CFLAGS} a.c -o a.o -c 2>/dev/null || return 1
@ -153,6 +196,10 @@ test_strip_lto_bytecode() {
# strip-lto-bytecode will error out early with LLVM,
# so stop the test here.
tc-is-clang && return 0
# strip with >= GNU Binutils 2.46 won't corrupt the archive:
# https://sourceware.org/PR21479
# https://sourceware.org/PR33271
_strip_is_gnu && ver_test $(_check_binutils_version $(tc-getSTRIP)) -gt 2.45 && return 0
$(tc-getCC) ${CFLAGS} a.c -o a.o -c 2>/dev/null || return 1
$(tc-getAR) qD test.a a.o 2>/dev/null || return 1