diff options
| author | Zach van Rijn <me@zv.io> | 2022-12-20 10:10:39 -0600 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-12-20 10:10:39 -0600 |
| commit | 3e6517d83b1a545507c1e000562cbfba08342d96 (patch) | |
| tree | cbb91bea0b154bb6c263be6782cf98b32081c13f /setup-abuild | |
| parent | e6db002716c0c46fd73ebc258ada23edbf5c7d12 (diff) | |
| download | bootstrap-3e6517d83b1a545507c1e000562cbfba08342d96.tar.gz bootstrap-3e6517d83b1a545507c1e000562cbfba08342d96.tar.bz2 bootstrap-3e6517d83b1a545507c1e000562cbfba08342d96.tar.xz bootstrap-3e6517d83b1a545507c1e000562cbfba08342d96.zip | |
Use latest mcmtools. Fix miscellaneous oversights.
Diffstat (limited to 'setup-abuild')
| -rwxr-xr-x | setup-abuild | 10 |
1 files changed, 7 insertions, 3 deletions
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}; ## |