diff options
| author | Zach van Rijn <me@zv.io> | 2023-09-19 14:24:30 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2023-09-19 14:24:30 -0500 |
| commit | 3f43b0d62e71aaa626a287aabdbe47a465a38929 (patch) | |
| tree | 4a0a12eba348444973738ff4d7e7f670e9a24879 /setup-abuild | |
| parent | 135bec19fccffe70a9a180bb4cf8474359b8ead6 (diff) | |
| download | bootstrap-3f43b0d62e71aaa626a287aabdbe47a465a38929.tar.gz bootstrap-3f43b0d62e71aaa626a287aabdbe47a465a38929.tar.bz2 bootstrap-3f43b0d62e71aaa626a287aabdbe47a465a38929.tar.xz bootstrap-3f43b0d62e71aaa626a287aabdbe47a465a38929.zip | |
Miscellaneous updates/improvements. Fixes #1.
Diffstat (limited to 'setup-abuild')
| -rwxr-xr-x | setup-abuild | 20 |
1 files changed, 12 insertions, 8 deletions
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 \ ; |