coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-19 09:08:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

tree.sh: break up check_gnu_path to subfunctions

Browse Source 
this whole check could probably be removed, honestly.

it was only put in place during the debian trixie testing
release cycle, before they finally updated gnat just before
the stable release of trixie came out.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-10-01 07:42:10 +01:00
parent 3b6d2b799c
commit 8b351e51aa
1 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tree.sh
+47 -18
View File
@@ -427,6 +427,7 @@ check_cross_compiler()
# trixie/sid had gnat-13 as gnat and gcc-14 as gcc, but has gnat-14 in apt. in # trixie/sid had gnat-13 as gnat and gcc-14 as gcc, but has gnat-14 in apt. in
# some cases, gcc 13+14 and gnat-13 are present; or gnat-14 and gcc-14, but # some cases, gcc 13+14 and gnat-13 are present; or gnat-14 and gcc-14, but
# gnat in PATH never resolves to gnat-14, because gnat-14 was "experimental" # gnat in PATH never resolves to gnat-14, because gnat-14 was "experimental"
check_gnu_path() check_gnu_path()
{ {
if ! command -v "$1" 1>/dev/null; then if ! command -v "$1" 1>/dev/null; then
@@ -434,6 +435,20 @@ check_gnu_path()
fi fi
eval "`setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir`" eval "`setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir`"
if host_gcc_gnat_match "$@"; then
return 0
fi
if ! match_gcc_gnat_versions "$@"; then
return 1
fi
}
# check if gcc/gnat versions already match:
host_gcc_gnat_match()
{
if ! gnu_setver "$1" "$1"; then if ! gnu_setver "$1" "$1"; then
err "Command '$1' unavailable." "check_gnu_path" "$@" err "Command '$1' unavailable." "check_gnu_path" "$@"
fi fi
@@ -441,12 +456,17 @@ check_gnu_path()
eval "[ -z \"\$$1ver\" ] && err \"Cannot detect host '$1' version\"" eval "[ -z \"\$$1ver\" ] && err \"Cannot detect host '$1' version\""
if [ "$gnatfull" = "$gccfull" ]; then if [ "$gnatfull" != "$gccfull" ]; then
# matching gcc/gnat versions # non-matching gcc/gnat versions
return 0 return 1
fi fi
}
# find all gcc/gnat versions, matching them up in PATH:
match_gcc_gnat_versions()
{
eval "$1dir=\"$(dirname "$(command -v "$1")")\"" eval "$1dir=\"$(dirname "$(command -v "$1")")\""
eval "_gnudir=\"\$$1dir\"" eval "_gnudir=\"\$$1dir\""
eval "_gnuver=\"\$$1ver\"" eval "_gnuver=\"\$$1ver\""
@@ -466,23 +486,32 @@ check_gnu_path()
return 1 return 1
fi fi
( ( link_gcc_gnat_versions "$@" "$_gnudir" "$_gnuver" ) || \
remkdir "$xbtmp/gnupath" err "Can't link '$2-$_gnuver' '$_gnudir'" "check_gnu_path" "$@"; :
x_ cd "$xbtmp/gnupath"
for _gnubin in "$_gnudir/$2"*"-$_gnuver"
do
_gnuutil="${_gnubin##*/}"
if [ -e "$_gnubin" ]; then
x_ ln -s "$_gnubin" "${_gnuutil%"-$_gnuver"}"
fi
done
) || err \
"Can't link '$2-$_gnuver' '$_gnudir'" "check_gnu_path" "$@"; :
} }
# create symlinks in PATH, so that the GCC/GNAT versions match:
link_gcc_gnat_versions()
{
_gnudir="$3"
_gnuver="$4"
remkdir "$xbtmp/gnupath"
x_ cd "$xbtmp/gnupath"
for _gnubin in "$_gnudir/$2"*"-$_gnuver"
do
_gnuutil="${_gnubin##*/}"
if [ -e "$_gnubin" ]; then
x_ ln -s "$_gnubin" "${_gnuutil%"-$_gnuver"}"
fi
done
}
# get the gcc/gnat version
# fail: return 1 if util not found
gnu_setver() gnu_setver()
{ {
eval "$2 --version 1>/dev/null 2>/dev/null || return 1" eval "$2 --version 1>/dev/null 2>/dev/null || return 1"