diff options
Diffstat (limited to 'setup-abuild')
| -rwxr-xr-x | setup-abuild | 57 |
1 files changed, 45 insertions, 12 deletions
diff --git a/setup-abuild b/setup-abuild index e59ec41..d57cb56 100755 --- a/setup-abuild +++ b/setup-abuild @@ -15,7 +15,7 @@ cd "${DEST}"; # this directory will already exist if correct # so that we do not have to force building static musl binaries. # nmus=musl; -vmus=1.2.3; +vmus=1.2.5; test ! -f ._${nmus}-${vmus} && \ ( test ! -d ${nmus}-${vmus} \ @@ -101,7 +101,6 @@ test ! -f ._${nbld}-${vbld} && \ cd abuild-${vbld}; git checkout ${vbld}; while read k; do curl -sL ${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; @@ -132,12 +131,12 @@ rm -fr ${nbld}-${vbld}; # util-linux (for 'getopt' used by 'abuild-keygen') # nutl=util-linux; -vutl=08431acdf5b3accd0887ab550bfa4efabed751d6; +vutl=139980a5969bf851feda873fe918f34bee8fc055; test ! -f ._${nutl}-${vutl} && \ ( test ! -d ${nutl}-${vutl} \ && mkdir ${nutl}-${vutl} \ - && git clone https://github.com/karelzak/${nutl}.git ${nutl}-${vutl} \ + && git clone https://github.com/util-linux/${nutl}.git ${nutl}-${vutl} \ ; cd ${nutl}-${vutl}; git checkout ${vutl}; @@ -148,6 +147,7 @@ test ! -f ._${nutl}-${vutl} && \ --host="$(${CC} -dumpmachine)" \ --enable-static \ --disable-shared \ + --disable-liblastlog2 \ ; sed -i Makefile \ -e 's/chgrp/-chgrp/g' \ @@ -192,16 +192,16 @@ rm -fr ${npkg}-${vpkg}; # samurai (ninja replacement) # nsam=samurai; -vsam=4cc8f4a3654b72c977e0e62367d1ab6d5b873def; +vsam=67b3dc5309142b06404eca8084b8c048bb69f0f4; test ! -f ._${nsam}-${vsam} && ( test ! -d ${nsam}-${vsam} \ && git clone https://github.com/michaelforney/${nsam}.git ${nsam}-${vsam} \ ; cd ${nsam}-${vsam}; + git checkout ${vsam}; make -j$(nproc) install \ PREFIX="" \ - LDFLAGS="-static" \ DESTDIR="${DEST}" \ ; @@ -219,7 +219,7 @@ rm -fr ${nsam}-${vsam}; # The requested URL returned error: 500 # nmun=muon; -vmun=834460da03dd4a0c5b4570ca905780ce191c2443; +vmun=f5000cc37912e9e1b97851f841cd9be0aa0ccb24; test ! -f ._${nmun}-${vmun} && ( test ! -d ${nmun}-${vmun} \ @@ -233,8 +233,7 @@ test ! -f ._${nmun}-${vmun} && ./bootstrap.sh \ bootstrap \ ; - bootstrap/muon setup \ - -Dstatic=true \ + bootstrap/muon-bootstrap setup \ build \ ; samu -C build; @@ -258,6 +257,7 @@ test ! -f ._${natl}-${vatl} && \ && git clone https://git.alpinelinux.org/${natl} ${natl}-${vatl} \ ; cd ${natl}-${vatl}; + git checkout ${vatl}; sed -i Make.rules \ -e '/targets += $(__shlibs) $(shobjs)/d' \ ; # disable shared libs @@ -308,7 +308,7 @@ rm -fr ${natl}-${vatl}; # pax-utils # npax=pax-utils; -vpax=974b9359c2f89d57e69598572aafcd8f920d79e2; +vpax=9ef54b472e42ba2c5479fbd86b8be2275724b064; test ! -f ._${npax}-${vpax} && \ ( test ! -d ${npax}-${vpax} \ @@ -345,6 +345,7 @@ https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=bb https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-stdint.patch?id=bb497eeb2155d0332284942105692bc05fec25a9 https://git.alpinelinux.org/aports/plain/main/fakeroot/fix-format.patch?id=bb497eeb2155d0332284942105692bc05fec25a9 https://git.alpinelinux.org/aports/plain/main/fakeroot/fix-shell-in-fakeroot.patch?id=bb497eeb2155d0332284942105692bc05fec25a9 +https://git.adelielinux.org/adelie/packages/-/raw/bc7fcd1b36a697ab8ce5fd6ace425a9143330dce/system/fakeroot/xstatjunk.patch EOF ./bootstrap; f=$(mktemp); # needed due to "error: unknown type name 'cap_user_header_t'" @@ -352,7 +353,8 @@ EOF cat libfakeroot.c >> ${f}; mv ${f} libfakeroot.c; rm -fr x; mkdir x; cd x; - CFLAGS="-static -D_STAT_VER=0 $CFLAGS" \ + # If CFLAGS has '-static', .so files are not installed! + CFLAGS="-D_STAT_VER=0 $CFLAGS" \ ../configure \ --prefix="${DEST}" \ --host="$(${CC} -dumpmachine)" \ @@ -370,7 +372,7 @@ rm -fr ${nfrt}-${vfrt}; # attr # natt=attr; -vatt=2979615e71fb53b3f2f9085eea516d4e2b3174ea; +vatt=8a80d895dfd779373363c3a4b62ecce5a549efb2; test ! -f ._${natt}-${vatt} && ( test ! -d ${natt}-${vatt} \ @@ -390,3 +392,34 @@ test ! -f ._${natt}-${vatt} && ) touch ._${natt}-${vatt}; rm -fr ${natt}-${vatt}; + + +## +# libarchive +# +nlar=libarchive; +vlar=0348e24bab24cc46642d29e3ceab64df22553298; # until autoconf 2.71 +test ! -f ._${nlar}-${vlar} && +( + test ! -d ${nlar}-${vlar} \ + && git clone https://github.com/libarchive/${nlar}.git ${nlar}-${vlar} \ + ; + cd ${nlar}-${vlar}; + git checkout ${vlar}; + autoreconf -fiv; + CFLAGS="-static" \ + ./configure \ + --prefix="${DEST}" \ + --host="$(${CC} -dumpmachine)" \ + --enable-static \ + --disable-shared \ + ; + make -j$(nproc) install; + # These are required by 'abuild' instead of GNU tar. + # Note that 'cat' will break the mcmtools 'bootstrap'. + for k in cpio tar; do + ln -sf bsd${k} "${DEST}"/bin/${k}; + done +) +touch ._${nlar}-${vlar}; +rm -fr ${nlar}-${vlar}; |