From 1965c9714ea9b35272d9ada830067b5508359764 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 4 Aug 2020 23:47:32 +0100 Subject: [PATCH] Makefile: Don't insist on `/usr/lib/.../coreutils/'. It turns out that sid has moved `stdlib.so' to `/usr/libexec/', which sucks for two reasons: (a) it means we need countermeasures to avoid the cross-tools extraction from failing, and (b) there's no multiarch triplet any more so we can't have multiple versions. I think this is actually a Debian bug, but I have to deal with it right now and this seems like the least terrible approach. I'll just hope that nothing is relying on `stdbuf' in the build scripts. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b4a616..fb888c0 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ CROSS_PATHS += \ sha256sum sha384sum sha512sum shred shuf sort split stat \ stdbuf sum tac tail tee test timeout tr truncate tsort tty \ unexpand uniq unlink users wc who whoami yes) \ - /usr/lib/MULTI/coreutils/ \ + ?/usr/lib/MULTI/coreutils/ \ $(addprefix /lib/MULTI/, \ libnsl.so.* libnss_*.so.*) \ /usr/bin/gpgv \ -- 2.11.0