summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-12-25 12:16:42 -0600
committerZach van Rijn <me@zv.io>2022-12-25 12:16:42 -0600
commit135bec19fccffe70a9a180bb4cf8474359b8ead6 (patch)
tree7988d52013ce5f084c53a00301771d19d48642a3
parent3e6517d83b1a545507c1e000562cbfba08342d96 (diff)
downloadbootstrap-135bec19fccffe70a9a180bb4cf8474359b8ead6.tar.gz
bootstrap-135bec19fccffe70a9a180bb4cf8474359b8ead6.tar.bz2
bootstrap-135bec19fccffe70a9a180bb4cf8474359b8ead6.tar.xz
bootstrap-135bec19fccffe70a9a180bb4cf8474359b8ead6.zip
Pull in upstream 'abuild' patch.
-rwxr-xr-xbootstrap4
-rwxr-xr-xsetup-abuild1
2 files changed, 3 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index 1f5c723..42db383 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 : 20221220
+# Revision : 20221225
#===============================================================
#===============================================================
@@ -670,7 +670,7 @@ if ! test -f rootfs-${TARGET}-patched.tgz; then
##
# Build 'binsub', a string patch tool.
#
- "${MTOOLS}"/musl/bin/gcc -static -O3 \
+ "${MTOOLS}"/musl/bin/gcc -static -O3 \
-o binsub \
"${HERE}"/binsub.c \
;
diff --git a/setup-abuild b/setup-abuild
index f6e17d5..97745ed 100755
--- a/setup-abuild
+++ b/setup-abuild
@@ -100,6 +100,7 @@ test ! -f ._${nbld}-${vbld} && \
git checkout ${vbld};
while read k; do curl -s ${k} | patch -p1 || true; done <<EOF
http://ix.io/4ifN
+https://git.alpinelinux.org/abuild/patch/abuild.in?id=f263cb9f49f3861f3141c22a74360b06cec7b868
EOF
rm -fr x; mkdir x; cd x;
export SSL_CFLAGS="-I${DEST}/include";