Makefile: Don't insist on `/usr/lib/.../coreutils/'. master
authorMark Wooding <mdw@distorted.org.uk>
Tue, 4 Aug 2020 22:47:32 +0000 (23:47 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 9 Aug 2020 00:08:14 +0000 (01:08 +0100)
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

index 4b4a616..fb888c0 100644 (file)
--- 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 \