Mathieu Benoit
f67796d04c
sqlite is the deferred item this port had written down long ago -- "libtcl8.6 versus our tcl 9.0" -- arriving as a missing directory: mv: cannot stat '<pkgdir>/usr/lib/tcl8.6/sqlite*': No such file or directory The version is read from the tree rather than written in, because the tcl package decides it and hardcoding 9.0 puts the same trap back one release later. The first attempt guarded with a blanket `grep tcl8.6` and condemned correct code: the existing section of that hook names tcl8.6 on purpose, because it is about the HOST's tcl. It also substituted $_tcldir into that older section, before the variable was defined. The guard caught both. util-linux is the seventh package to fail on a path at the end of package() after a compile that worked. libpsl's error names its own fix. --- FR --- sqlite est l'élément différé que ce portage avait noté depuis longtemps — « libtcl8.6 contre notre tcl 9.0 » — arrivant sous la forme d'un répertoire absent : mv: cannot stat '<pkgdir>/usr/lib/tcl8.6/sqlite*': No such file or directory La version est lue dans l'arbre plutôt qu'écrite en dur, parce que c'est le paquet tcl qui la décide et qu'inscrire 9.0 remettrait le même piège une version plus tard. La première tentative gardait par un `grep tcl8.6` global et condamnait du code juste : la section existante de ce hook nomme tcl8.6 exprès, car elle traite du tcl de l'HÔTE. Elle avait aussi injecté $_tcldir dans cette section antérieure, avant que la variable soit définie. Le garde a attrapé les deux. util-linux est le septième paquet à échouer sur un chemin en fin de package() après une compilation réussie. L'erreur de libpsl nomme son propre correctif. Assisted-by: Claude Opus 5
81 lines
3.9 KiB
Bash
Executable file
81 lines
3.9 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# sqlite: the tcl extension installs where Ubuntu's tclConfig.sh says, not
|
|
# where Arch's does.
|
|
#
|
|
# mv: cannot stat '<pkgdir>/usr/lib/tcl8.6/sqlite*': No such file or directory
|
|
#
|
|
# THE TRAP is that tcl was found. The log says so, plainly:
|
|
#
|
|
# Checking for tclsh8.6.../usr/bin/tclsh8.6
|
|
# Using tclConfig.sh: /usr/lib/s390x-linux-gnu/tclConfig.sh
|
|
#
|
|
# so "install tcl-dev" looks like it worked, and the failure looks like a
|
|
# separate problem. It is the same problem one layer down: tclConfig.sh
|
|
# carries TCL_PACKAGE_PATH, and Ubuntu's says share/tcltk while Arch's says
|
|
# lib. Measured in the pkgdir:
|
|
#
|
|
# usr/share/tcltk/tcl8.6/sqlite3.53.4/libsqlite3.53.4.so
|
|
#
|
|
# and usr/lib/tcl8.6 does not exist at all. This is the multiarch libdir theme
|
|
# again -- a path the BUILD HOST decides -- but one layer out from the library
|
|
# directory itself, which is why --libdir does not reach it.
|
|
#
|
|
# The tree is relocated to Arch's path before package_sqlite() splits it out,
|
|
# so the upstream mv keeps working unchanged. Same shape as the lib64 merge in
|
|
# gcc.sh: move the tree, do not rewrite every path that names it.
|
|
set -euo pipefail
|
|
python3 - <<'PY'
|
|
import io
|
|
s = io.open("PKGBUILD", encoding="utf-8").read()
|
|
anchor = " # split out tcl extension\n"
|
|
assert s.count(anchor) == 1, "sqlite: expected one tcl split block"
|
|
fix = """ # Ubuntu's tclConfig.sh puts the tcl package tree under share/tcltk;
|
|
# Arch's puts it under lib. Move it before the split below reads it.
|
|
if [ -d "$pkgdir"/usr/share/tcltk/tcl8.6 ]; then
|
|
mkdir -p "$pkgdir"/usr/lib
|
|
mv "$pkgdir"/usr/share/tcltk/tcl8.6 "$pkgdir"/usr/lib/tcl8.6
|
|
rmdir --ignore-fail-on-non-empty "$pkgdir"/usr/share/tcltk
|
|
fi
|
|
"""
|
|
s = s.replace(anchor, fix + anchor, 1)
|
|
io.open("PKGBUILD", "w", encoding="utf-8").write(s)
|
|
PY
|
|
grep -q "tclConfig.sh puts the tcl package tree" PKGBUILD || {
|
|
echo "sqlite: tcl relocation not inserted" >&2; exit 1; }
|
|
echo "sqlite: tcl extension relocated from share/tcltk to lib (host TCL_PACKAGE_PATH)"
|
|
|
|
# --- and in the chroot, our tcl is not 8.6 -----------------------------------
|
|
#
|
|
# mv: cannot stat '<pkgdir>/usr/lib/tcl8.6/sqlite*': No such file or directory
|
|
#
|
|
# The section above solves the HOST's problem: Ubuntu's tclConfig.sh says
|
|
# share/tcltk, so the tree is relocated to usr/lib/tcl8.6 where the upstream mv
|
|
# expects it. Inside the stage-2 chroot neither half of that applies -- Arch's
|
|
# tclConfig.sh already says lib, and our tcl is 9.0, so sqlite installs into
|
|
# usr/lib/tcl9.0 and the upstream mv finds nothing. The relocation above becomes
|
|
# a no-op there, correctly, because it is guarded by [ -d ].
|
|
#
|
|
# This is the deferred item this port had already written down -- "libtcl8.6
|
|
# versus our tcl 9.0" -- arriving as a missing directory rather than as a version
|
|
# mismatch.
|
|
#
|
|
# The version is READ from the tree, not written in. Hardcoding 9.0 would put the
|
|
# same trap back one release later, and the tcl package is what decides it.
|
|
python3 - <<'ZZPY'
|
|
import io
|
|
s = io.open("PKGBUILD", encoding="utf-8").read()
|
|
old = 'mv "$pkgdir"/usr/lib/tcl8.6/sqlite* "$srcdir"/tcl'
|
|
assert s.count(old) == 1, "sqlite: the upstream tcl move is not in the expected form"
|
|
new = ('_tcldir=$(cd "$pkgdir"/usr/lib && echo tcl[0-9]*)\n'
|
|
' [ -d "$pkgdir/usr/lib/$_tcldir" ] || { echo "sqlite: no tcl dir under usr/lib" >&2; exit 1; }\n'
|
|
' mv "$pkgdir"/usr/lib/"$_tcldir"/sqlite* "$srcdir"/tcl')
|
|
s = s.replace(old, new, 1)
|
|
io.open("PKGBUILD", "w", encoding="utf-8").write(s)
|
|
ZZPY
|
|
# Only the upstream mv had to change. The relocation above still names tcl8.6 on
|
|
# purpose -- it is about the HOST's tcl -- so a blanket grep for tcl8.6 would
|
|
# condemn correct code, and did on the first attempt.
|
|
grep -qE '^[[:space:]]*mv .*usr/lib/tcl8\.6/sqlite' PKGBUILD && {
|
|
echo "sqlite: the hardcoded upstream move survived" >&2; exit 1; }
|
|
grep -q '_tcldir=' PKGBUILD || { echo "sqlite: the tcl dir is not discovered" >&2; exit 1; }
|
|
echo "sqlite: upstream tcl move reads the version from the tree"
|