Fix bootstrap-deps.sh: correct xkbcommon dir, dpkg multiarch, trim wlroots backends
- Detect multiarch via dpkg-architecture before a compiler exists - Add dpkg-dev, gettext, libgdk-pixbuf-2.0-dev to apt packages - Skip a step when the installed version is >= the pin (>= semantics) - Use the real libxkbcommon-xkbcommon-1.8.1 extract directory - Build wlroots with -Dbackends= -Dsession=disabled so no libxcb-*-dev is needed
This commit is contained in:
parent
280c1d069b
commit
bd31b2a157
3 changed files with 16 additions and 16 deletions
2
run.sh
2
run.sh
|
|
@ -2,7 +2,7 @@
|
|||
set -e
|
||||
|
||||
dir="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
|
||||
multiarch="$(cc -print-multiarch 2>/dev/null || echo x86_64-linux-gnu)"
|
||||
multiarch="$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || cc -print-multiarch 2>/dev/null || echo x86_64-linux-gnu)"
|
||||
libdir="$HOME/.local/lib/$multiarch"
|
||||
|
||||
export GI_TYPELIB_PATH="$libdir/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue