libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

path.sh: Further cleanup 

Remove all symlinks each time, to ensure that no
stragglers are left behind, since they are being
re-generated each time anyway.

The code for determining version numbers has now
been unified under gnu_setver()

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2024-12-30 14:10:32 +00:00
parent 5b24e0a5a9
commit 295463d281
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lib.sh
View File

@ -95,7 +95,7 @@ if [ -z "${TMPDIR+x}" ]; then
export TMPDIR="/tmp"
export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)"
touch lock || $err "cannot create 'lock' file"
rm -Rf xbmkpath || $err "cannot create xbmkpath"
rm -Rf xbmkpath || $err "cannot remove xbmkpath"
mkdir -p xbmkpath || $err "cannot create xbmkpath"
export PATH="$PWD/xbmkpath:$PATH" || $err "Can't create xbmkpath"
xbmk_parent="y"

45
include/path.sh
View File

@ -1,48 +1,43 @@
# SPDX-License-Identifier: MIT
# Copyright (c) 2024 Leah Rowe <leah@libreboot.org>
eval `setvars "" gccver gccfull gnatver gnatfull gccdir`
# fix mismatching gcc/gnat versions on debian trixie/sid
check_gnat_path()
{
eval `setvars "" gccver gccfull gnatver gnatfull gccdir`
command -v gcc 1>/dev/null || $err "Command 'gcc' unavailable."
rm -f xbmkpath/* || $err "Cannot clear xbmkpath/"
for _util in gcc gnat; do
eval "$_util --version 1>/dev/null 2>/dev/null || continue"
eval "${_util}ver=\"`$_util --version 2>/dev/null | head -n1`\""
eval "${_util}ver=\"\${${_util}ver##* }\""
eval "${_util}full=\"\${$_util}ver\""
eval "${_util}ver=\"\${${_util}ver%%.*}\""
done
eval `setvars "" gccver gccfull gnatver gnatfull gccdir`
gnu_setver gcc gcc || $err "Command 'gcc' unavailable."
gnu_setver gnat gnat || :
[ -z "$gccver" ] && $err "Cannot detect host GCC version"
[ "$gnatfull" = "$gccfull" ] && return 0
gccdir="$(dirname "$(command -v gcc)")"
[ -d "$gccdir" ] || $err "gcc PATH dir \"$gccdir\" does not exist."
for _gnatbin in "$gccdir/gnat-"*; do
[ -f "$_gnatbin" ] || continue
[ "${_gnatbin#"$gccdir/gnat-"}" = "$gccver" ] || continue
gnatver="${_gnatbin#"$gccdir/gnat-"}"
break
gnatver="${_gnatbin#"$gccdir/gnat-"}"; break
done
[ -x "$gccdir/gnat-$gccver" ] || \
$err "$gccdir/gnat-$gccver not executable"
gnatfull="`"$gccdir/gnat-$gccver" --version | head -n1`"
gnatfull="${gnatfull##* }"
[ "${gnatfull%%.*}" = "$gnatver" ] || \
$err "$gccdir/gnat-$gccver v${gnatfull%%.*}; expected v$gnatver"
gnu_setver "gnat" "$gccdir/gnat-$gccver" || $err "Unknown gnat version"
[ "$gnatfull" = "$gccfull" ] || $err "GCC/GNAT versions do not match."
(
x_ cd xbmkpath
for _gnatbin in "$gccdir/gnat"*"-$gccver"; do
[ -e "$_gnatbin" ] || continue
_gnatutil="${_gnatbin##*/}"
ln -s "$_gnatbin" "${_gnatutil%"-$gccver"}" || \
$err "E: ln -s \"$_gnatbin\" \"${_gnatutil%"-$gccver"}\""
[ -e "$_gnatbin" ] || continue; _gnatutil="${_gnatbin##*/}"
x_ ln -s "$_gnatbin" "${_gnatutil%"-$gccver"}"
done
) || $err "Cannot create gnat-$gccver link in $gccdir"
) || $err "Cannot create gnat-$gccver link in $gccdir"; :
}
gnu_setver()
{
eval "$2 --version 1>/dev/null 2>/dev/null || return 1"
eval "${1}ver=\"`$2 --version 2>/dev/null | head -n1`\""
eval "${1}ver=\"\${${1}ver##* }\""
eval "${1}full=\"\${$1}ver\""
eval "${1}ver=\"\${${1}ver%%.*}\""; :
}