Use latest mcmtools. Fix miscellaneous oversights.

2 files changed, 15 insertions, 7 deletions

diff --git a/bootstrap b/bootstrap
index d2fcf08..1f5c723 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,7 +5,7 @@
 # Purpose  : Bootstraps Adélie from source for any architecture.
 # Authors  : Zach van Rijn <me@zv.io>
 # License  : MIT
-# Revision : 20221209
+# Revision : 20221220
 #===============================================================
 
 #===============================================================
@@ -405,7 +405,7 @@ if ! test -d "${MTOOLS}"/sys/emus/bin; then # FIXME: no hard code
     test -d bootstrap                                          \
         || git clone ${CHAINS}/bootstrap.git;
     cd bootstrap;
-    git checkout 371f5e2624acd89dd05a9bd8c68f369b16dfdde6;
+    git checkout 6834829d499e823e776368ce02691be2caac1727;
 
     ## seed rootfs
     #
@@ -630,6 +630,7 @@ CXX=g++                                                        \
 AR=ar                                                          \
 LD=ld                                                          \
 CPP=cpp                                                        \
+RANLIB=ranlib                                                  \
 ${MTOOLS}/sys/emus/bin/proot                                   \
     -S "${BASE}"/mcmtools-${TARGET}/sys                        \
     -q "${MTOOLS}"/sys/emus/bin/qemu-${q}                      \
@@ -663,12 +664,16 @@ fi
 #
 cd "${BASE}";
 if ! test -f rootfs-${TARGET}-patched.tgz; then
+    rm -f    rootfs-${TARGET}.tar;
     gzip -dk rootfs-${TARGET}.tgz;
 
     ##
     # Build 'binsub', a string patch tool.
     #
-    "${MTOOLS}"/musl/bin/gcc -static -o binsub binsub.c -O3;
+    "${MTOOLS}"/musl/bin/gcc -static -O3 \
+        -o binsub                                              \
+        "${HERE}"/binsub.c                                     \
+        ;
 
     ##
     # Replace with explicit '/' ('/foo/bar/baz' --> '/' instead
@@ -681,7 +686,6 @@ if ! test -f rootfs-${TARGET}-patched.tgz; then
         ;
 
     gzip -c9 rootfs-${TARGET}.tar > rootfs-${TARGET}-patched.tgz;
-
     rm -f    rootfs-${TARGET}.tar;
 fi
 
diff --git a/setup-abuild b/setup-abuild
index 686df6d..f6e17d5 100755
--- a/setup-abuild
+++ b/setup-abuild
@@ -119,6 +119,7 @@ EOF
     sed -i "${DEST}/bin/abuild"                                \
         -e 's@/bin/ash -e@/usr/bin/env bash@'                  \
         ; # hardcoded
+    chmod +r "${DEST}"/bin/abuild-sudo; # otherwise has s/x/x!
 )
 touch ._${nbld}-${vbld};
 rm -fr  ${nbld}-${vbld};
@@ -293,6 +294,9 @@ test ! -f ._${npax}-${vpax} &&                                 \
     cd ${npax}-${vpax};
     git checkout ${vpax};
     muon setup build;
+    sed -i build/build.ninja                                   \
+        -e "s@ ar @ ${AR} @g"                                  \
+        ;
     samu    -C build;
     muon    -C build install;
 )
@@ -305,7 +309,7 @@ rm -fr  ${npax}-${vpax};
 #
 nfrt=fakeroot;
 vfrt=8c0260009e85264fd1ea282fbb22063fc694c552; # until autoconf 2.71
-test ! -f ._${nfrt}-${vfrt#*:} &&                              \
+test ! -f ._${nfrt}-${vfrt} &&                              \
 (
     test ! -d ${nfrt}-${vfrt}                                  \
         && git clone https://salsa.debian.org/clint/${nfrt}.git ${nfrt}-${vfrt} \
@@ -334,8 +338,8 @@ EOF
         ;
     make -j$(nproc) install;
 )
-touch ._${nfrt}-${vfrt#*:};
-rm -fr  ${nfrt}-${vfrt#*:};
+touch ._${nfrt}-${vfrt};
+rm -fr  ${nfrt}-${vfrt};
 
 
 ##