From c6f589cad03e73ce1fa6af7829f6aebd9d80c8b3 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Fri, 9 Dec 2022 13:59:18 -0600
Subject: Fix two omitted utilities. Add 'attr'.

---
 scripts/bootstrap-abuild | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-abuild b/scripts/bootstrap-abuild
index c35dd2f51..a7ffcc733 100755
--- a/scripts/bootstrap-abuild
+++ b/scripts/bootstrap-abuild
@@ -103,16 +103,13 @@ test ! -f ._${nbld}-${vbld} &&                                 \
         ;
     cd abuild-${vbld};
     git checkout ${vbld};
-#    patch -p1 --forward < "${HERE}/patches/0001-allow-untrusted.diff" || true; # FIXME
-#    patch -p1 --forward < "${HERE}/patches/0001-etc-apk-keys.diff" || true; # FIXME
-#    patch -p1 --forward < "${HERE}/patches/0001-extra-lib-paths.diff" || true; # FIXME
     rm -fr x; mkdir x; cd x;
     export SSL_CFLAGS="-I${DEST}/include";
     export SSL_LDFLAGS="-L${DEST}/lib";
     export SSL_LIBS="-lssl -lcrypto"; # not in mcmtools
     export ZLIB_LIBS="-lz"; # do not use from mcmtools
     export LDFLAGS="-L${DEST}/lib -lssl -lcrypto";
-    export CFLAGS="-DABUILD_GROUP=\\\"$(id -gn)\\\" -static -I${DEST}/include"; # default 'abuild' if undefined
+    export CFLAGS="-static -I${DEST}/include";
     sed -i "${DEST}/abuild-${vbld}/abuild-sudo.c"              \
         -e "s@/sbin/apk@${DEST}/bin/apk@"                      \
         ; # hardcoded
@@ -183,6 +180,7 @@ test ! -f ._${npkg}-${vpkg} &&
         --with-system-includedir=/usr/include                  \
         ;
     make -j$(nproc) install;
+    ln -s pkgconf "${DEST}"/bin/pkg-config
 )
 touch ._${npkg}-${vpkg};
 rm -fr  ${npkg}-${vpkg};
@@ -297,6 +295,8 @@ test ! -f ._${npax}-${vpax} &&                                 \
     cd ${npax}-${vpax};
     git checkout ${vpax};
     muon setup build;
+    samu    -C build;
+    muon    -C build install;
 )
 touch ._${npax}-${vpax};
 rm -fr  ${npax}-${vpax};
@@ -338,3 +338,27 @@ EOF
 )
 touch ._${nfrt}-${vfrt#*:};
 rm -fr  ${nfrt}-${vfrt#*:};
+
+
+##
+# attr
+#
+natt=attr;
+vatt=2979615e71fb53b3f2f9085eea516d4e2b3174ea;
+test ! -f ._${natt}-${vatt} &&
+(
+    test ! -d ${natt}-${vatt}                                  \
+        && git clone https://git.savannah.nongnu.org/git/${natt}.git ${natt}-${vatt} \
+        ;
+    cd ${natt}-${vatt};
+    git checkout ${vatt};
+    ./autogen.sh;
+    ./configure                                                \
+        --prefix="${DEST}"                                     \
+        --enable-static                                        \
+        --disable-shared                                       \
+        ;
+    make -j$(nproc) install;
+)
+touch ._${natt}-${vatt};
+rm -fr  ${natt}-${vatt};
-- 
cgit v1.2.3-70-g09d2