From 3f43b0d62e71aaa626a287aabdbe47a465a38929 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Tue, 19 Sep 2023 14:24:30 -0500
Subject: Miscellaneous updates/improvements. Fixes #1.

---
 setup-abuild | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'setup-abuild')

diff --git a/setup-abuild b/setup-abuild
index 97745ed..46122c8 100755
--- a/setup-abuild
+++ b/setup-abuild
@@ -41,7 +41,7 @@ rm -fr  ${nmus}-${vmus};
 # OpenSSL
 #
 nssl=openssl;
-vssl=1.1.1s;
+vssl=1.1.1v;
 test ! -f ._${nssl}-${vssl} &&                                 \
 (
     test ! -d ${nssl}-${vssl}                                  \
@@ -66,7 +66,7 @@ rm -fr  ${nssl}-${vssl};
 # zlib
 #
 nzlb=zlib;
-vzlb=1.2.13;
+vzlb=1.3;
 test ! -f ._${nzlb}-${vzlb} &&                                 \
 (
     test ! -d ${nzlb}-${vzlb}                                  \
@@ -199,6 +199,7 @@ test ! -f ._${nsam}-${vsam} &&
     cd ${nsam}-${vsam};
     make -j$(nproc) install                                    \
         PREFIX=""                                              \
+        LDFLAGS="-static"                                      \
         DESTDIR="${DEST}"                                      \
         ;
 
@@ -211,7 +212,7 @@ rm -fr  ${nsam}-${vsam};
 # muon (meson replacement)
 #
 nmun=muon;
-vmun=62ce4561b4444e5020dc39aad0381655afeda0d6;
+vmun=34953adc6bd14851fe6fa5f5d469f7ef28ee3b32;
 test ! -f ._${nmun}-${vmun} &&
 (
     test ! -d ${nmun}-${vmun}                                  \
@@ -224,14 +225,14 @@ test ! -f ._${nmun}-${vmun} &&
     ./bootstrap.sh                                             \
         bootstrap                                              \
         ;
-	bootstrap/muon setup \
-		-Dstatic=true \
-		build \
+    bootstrap/muon setup                                       \
+        -Dstatic=true                                          \
+        build                                                  \
         ;
     sed -i build/build.ninja                                   \
         -e "s@\bar\b@${AR}@g"                                  \
         ;
-	samu -C build;
+    samu -C build;
     cp build/muon "${DEST}/bin";
 )
 touch ._${nmun}-${vmun};
@@ -330,9 +331,10 @@ EOF
     cat libfakeroot.c >> ${f};
     mv ${f} libfakeroot.c;
     rm -fr x; mkdir x; cd x;
-    CFLAGS="-D_STAT_VER=0 $CFLAGS"                             \
+    CFLAGS="-static -D_STAT_VER=0 $CFLAGS"                     \
     ../configure                                               \
         --prefix="${DEST}"                                     \
+        --host="$(${CC} -dumpmachine)"                         \
         ;
     sed -i Makefile                                            \
         -e '/^SUBDIRS =/ s/doc//g'                             \
@@ -356,8 +358,10 @@ test ! -f ._${natt}-${vatt} &&
     cd ${natt}-${vatt};
     git checkout ${vatt};
     ./autogen.sh;
+    CFLAGS="-static"                                           \
     ./configure                                                \
         --prefix="${DEST}"                                     \
+        --host="$(${CC} -dumpmachine)"                         \
         --enable-static                                        \
         --disable-shared                                       \
         ;
-- 
cgit v1.2.3-70-g09d2