Static linking checks for executables - pthbs - Packaging Through Hashed Build Scripts

commit 6c126ceb9e72c9c9db838f49c0b63dad3b305a7f
parent 2bc5afb67b5bfde75a3f44fec93d08fd9252a4cc
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 12:56:12 +0100

Static linking checks for executables

Diffstat:
M packages/aat  | 6 +++---
M packages/bison  | 37 ++++++++++++++++++++++++++++---------
M packages/bootstrap.environment  | 4 ++--
M packages/busybox  | 6 +++---
M packages/busybox-diffutils  | 2 +-
M packages/busybox-login  | 2 +-
M packages/busybox:bootstrap  | 4 ++--
M packages/confz  | 6 +++---
M packages/containers  | 8 ++++----
M packages/core-system-conf  | 10 +++++-----
M packages/core-system-init  | 18 +++++++++---------
M packages/core-system-rc  | 12 ++++++------
M packages/core-system-scripts  | 6 +++---
M packages/default.environment  | 62 +++++++++++++++++++++++++++++++-------------------------------
M packages/diffutils  | 22 +++++++++++++---------
M packages/elf.h  | 2 +-
M packages/elfutils  | 33 ++++++++++++++++++++++++++-------
M packages/execline  | 10 +++++-----
M packages/fileset  | 6 +++---
M packages/flex  | 42 ++++++++++++++++++++++++++++++------------
M packages/gmp  | 31 +++++++++++++++++++++++++------
M packages/gnu-make  | 33 ++++++++++++++++++++++++++-------
M packages/gnu-make:bootstrap  | 21 ++++++++++++++++++++-
M packages/libelf-compat  | 6 +++---
M packages/libelf.h  | 2 +-
M packages/linux  | 18 +++++++++---------
M packages/logincaps  | 10 +++++-----
M packages/m4  | 34 ++++++++++++++++++++++++++++------
M packages/mdevd  | 12 ++++++------
M packages/mpc  | 33 ++++++++++++++++++++++++++-------
M packages/mpfr  | 31 +++++++++++++++++++++++++------
M packages/musl-cross-make  | 4 ++--
M packages/netbsd-curses  | 6 +++---
M packages/patch  | 36 +++++++++++++++++++++++++++++-------
M packages/patchelf:bootstrap  | 25 ++++++++++++++++++++++---
M packages/popt  | 34 +++++++++++++++++++++++++---------
M packages/pthbs-banginstall  | 4 ++--
M packages/rsync  | 40 +++++++++++++++++++++++++++++-----------
M packages/s6  | 14 +++++++-------
M packages/s6-dns  | 10 +++++-----
M packages/s6-linux-init  | 14 +++++++-------
M packages/s6-linux-utils  | 10 +++++-----
M packages/s6-networking  | 16 ++++++++--------
M packages/s6-portable-utils  | 10 +++++-----
M packages/s6-rc  | 14 +++++++-------
M packages/skalibs  | 6 +++---
M packages/snaprep  | 6 +++---
M packages/userspace.environment  | 60 ++++++++++++++++++++++++++++++------------------------------
M packages/zsh  | 25 ++++++++++++++-----------
M templates/autotools  | 21 ++++++++++++++++++++-
M templates/pkg/bison  | 4 ++--
M templates/pkg/diffutils  | 17 +----------------
M templates/pkg/flex  | 11 +++++------
M templates/pkg/gnu-make  | 6 +++---
M templates/pkg/m4  | 5 ++++-
M templates/pkg/patch  | 5 ++++-
M templates/pkg/patchelf:bootstrap  | 4 ++--
M templates/pkg/popt  | 5 +----
M templates/pkg/rsync  | 7 +++----
M templates/pkg/zsh  | 18 +-----------------

60 files changed, 605 insertions(+), 361 deletions(-)
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 : ${JOBS:=1}
diff --git a/packages/bison b/packages/bison
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
-#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
+#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
 autotools() {
@@ -12,7 +12,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -41,10 +41,29 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
-export LDFLAGS="-static"
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
-autotools bison-3.8.2 --disable-nls --enable-static --disable-shared
+autotools_static bison-3.8.2 --disable-nls
+check_static command/bison
 rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias
 rmdir -p "$pthbs_destdir"/$prefix/lib || true
 
diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment
@@ -1,3 +1,3 @@
-#+busybox.348eb40a3e0240523c308856407f50941759aada1283c9b064a87bf188c13b15
-#+gnu-make.fe193ac49b4dde548726c2da5461481b0fd2b6d4f5262773311119d69ea123de
+#+busybox.623b05721c8f2129aae460e64de5710e9962ae4bd0bec65a54abe9c36e14ca7f
+#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
 #+musl-cross-make.9e72e0205ea3461afd890d31f22847a351061b712aadd7d44861fa5b3f9e1050 
\ No newline at end of file
diff --git a/packages/busybox b/packages/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.fe193ac49b4dde548726c2da5461481b0fd2b6d4f5262773311119d69ea123de
-#+busybox.348eb40a3e0240523c308856407f50941759aada1283c9b064a87bf188c13b15
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
+#+busybox.623b05721c8f2129aae460e64de5710e9962ae4bd0bec65a54abe9c36e14ca7f
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config
 
diff --git a/packages/busybox-diffutils b/packages/busybox-diffutils
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/busybox-login b/packages/busybox-login
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap
@@ -2,13 +2,13 @@
 #@pragma:nosandbox
 #@pragma:nopath
 #+musl-cross-make.9e72e0205ea3461afd890d31f22847a351061b712aadd7d44861fa5b3f9e1050
-#+gnu-make.fe193ac49b4dde548726c2da5461481b0fd2b6d4f5262773311119d69ea123de
+#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 : ${JOBS:=1}
 mcm=/home/ccx/versions/musl-cross-make.9e72e0205ea3461afd890d31f22847a351061b712aadd7d44861fa5b3f9e1050
-make=/home/ccx/versions/gnu-make.fe193ac49b4dde548726c2da5461481b0fd2b6d4f5262773311119d69ea123de
+make=/home/ccx/versions/gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
 
 export PATH="$mcm/bin:$make/command:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
diff --git a/packages/confz b/packages/confz
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 : ${JOBS:=1}
diff --git a/packages/containers b/packages/containers
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers
 
 : ${JOBS:=1}
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+aat.ad0ee08a72940a3c0e781508fa81baed5a97a15e63d15f32c490407f2e3729fc
-#+fileset.f058af8ef04d6ed8d30f2c679002130ab0c5720843aa1adb721228589f50a790
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+aat.c70f1f2bb252b007d86535f21131b25a67ed129addab27862079ce9c5607d229
+#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
 #@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
 
 : ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+s6.f9168d5a9df178b9c1196d21396b043ec5e812c4be45a7b7feccded49df8f5a9
-#+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
-#+s6-portable-utils.e604cd8783990cd0ee387b6587f13ca703b1cb7c379604025b6f6b9cec010e42
-#+s6-linux-init.e1efa661fba55d47641c4d9e25287ad4e1eb11a3fb356ba49c6e25fa00454f9f
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+core-system-rc.e96593f8f21cab2e545716139eb52fbc198e0ece184b9a47080d70b56fcd6ce0
-
-s6rcdb=/home/ccx/versions/core-system-rc.e96593f8f21cab2e545716139eb52fbc198e0ece184b9a47080d70b56fcd6ce0/s6-rc-db
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
+#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
+#+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
+#+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88
+
+s6rcdb=/home/ccx/versions/core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88/s6-rc-db
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
-#+fileset.f058af8ef04d6ed8d30f2c679002130ab0c5720843aa1adb721228589f50a790
-#+core-system-conf.20936155f7ad5fd5d1762de63ea5587b45e42569433479aaef5df41960b87d08
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
+#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
+#+core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1
 
-conf=/home/ccx/versions/core-system-conf.20936155f7ad5fd5d1762de63ea5587b45e42569433479aaef5df41960b87d08/core-system-conf
+conf=/home/ccx/versions/core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1/core-system-conf
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/core-system-scripts b/packages/core-system-scripts
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts
 
 : ${JOBS:=1}
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,30 +1,30 @@
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
-#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
-#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
-#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
-#+rsync.a98c442e2c01c7fbc2ac51f2c2eccb3e251a550eeb03c4285473a7344cc54643
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+s6.f9168d5a9df178b9c1196d21396b043ec5e812c4be45a7b7feccded49df8f5a9
-#+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
-#+s6-portable-utils.e604cd8783990cd0ee387b6587f13ca703b1cb7c379604025b6f6b9cec010e42
-#+s6-linux-utils.3d9ba05a8fc1542ed89d817c0e87b8b733c4f26820a0f827638c74ef4e414331
-#+s6-linux-init.e1efa661fba55d47641c4d9e25287ad4e1eb11a3fb356ba49c6e25fa00454f9f
-#+mdevd.32195ae02573003700555ca2c0cda4b79c370d8d0c127b14890059ff82b550ac
-#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
-#+s6-networking.fc977bc089cde121c95b471eed756105fc57c11ed0d169d2d59cfd48196912a8
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
-#+aat.ad0ee08a72940a3c0e781508fa81baed5a97a15e63d15f32c490407f2e3729fc
-#+confz.053f462b8fe44631e979377ac55cff1a33aad5b1eb61b78bc6a85d39cdbc9af9
-#+containers.dceb078fd8af39cbbad5e8f37c96e75406f7760cb91c93b44de1331045799171
-#+fileset.f058af8ef04d6ed8d30f2c679002130ab0c5720843aa1adb721228589f50a790
-#+logincaps.5311d501083b5ea4ff62afe4d5ebd55273f70576fdb72f0d77c87d4b6323680b
-#+snaprep.aeeb0aea12805557c5cd25c8e0d10caf44279df3290855fae4240a718f8ca5f3
-#+core-system-conf.20936155f7ad5fd5d1762de63ea5587b45e42569433479aaef5df41960b87d08
-#+core-system-rc.e96593f8f21cab2e545716139eb52fbc198e0ece184b9a47080d70b56fcd6ce0
-#+core-system-scripts.49d1a8f429e3159b684d96350a10bca5e2989ce5205581b1d3110d85ea3d1f45
-#+core-system-init.95ffda4d6c9a657ae9936f34ee238d99ffb983d982c00249c36d87d607e6d155
-#+linux.dc67f8e4b4fa80adf55fea32de8669433c127a3a6c1090b76a0ec5acfcdae098-
\ No newline at end of file
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
+#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
+#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
+#+bison.1e77c9a9664b0f73e9ba311eaac0546031d026b9642d1ab56c5ae67a44b657ad
+#+rsync.ee43ca0ffae53f31361524ff243380e0894111d5feb39b4a086f0a6456257601
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
+#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
+#+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
+#+s6-linux-utils.2df7505b7f9bf745c5d27eced90a85afb83f43e055e64e6f243e5831d3800db1
+#+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
+#+mdevd.1ccacf0514eeffea88fc8203b470398b95638632eae38f1048a6f3bf5754f6dd
+#+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
+#+s6-networking.15adf950be6728a030816bedd5b2283e78e41796cea59b614b22c44690dfd6fa
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+aat.c70f1f2bb252b007d86535f21131b25a67ed129addab27862079ce9c5607d229
+#+confz.3b690607c9899a24124457fe3c377a00c16477c79a82573b1b697f7a8d525f18
+#+containers.b9963e9c01d8611aecc203b590b3367818d270c1734c67de3276725797942541
+#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
+#+logincaps.b1b0dda3e04cb10d342dea30de9ec9fbe61a09185abf010d1087262b507a76aa
+#+snaprep.89ad65ef8b73fc38194a17e0566fbc828d7a1f581f51519daa7f1af4e6ef4b11
+#+core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1
+#+core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88
+#+core-system-scripts.708ec1bf1d5703eae6e0471c0d38641a91dbc549da6e08ec9fe649c66e2255f3
+#+core-system-init.1cd99da19276a4fbe8e3e37c240a343df003831da5af8ff6316a8094846a1e29
+#+linux.f938eeb3075dc9de68ed066b8beec8e1c95a04920417dc303fbaab4779220293+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,9 +40,10 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
-
-export LDFLAGS="-static"
-autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
 
 check_static() {
 	local exe || true
@@ -58,6 +59,9 @@ check_static() {
 	fi
 }
 
+
+
+autotools_static diffutils-3.10 --disable-nls
 check_static command/diff
 check_static command/cmp
 
diff --git a/packages/elf.h b/packages/elf.h
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h
 
 installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
diff --git a/packages/elfutils b/packages/elfutils
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,9 +40,28 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
 export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference"
-export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be/lib"
+export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d/lib"
 
 autotools elfutils-0.189 \
 	--disable-nls \
diff --git a/packages/execline b/packages/execline
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
 #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
 
 : ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/fileset b/packages/fileset
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
 #@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
 
 : ${JOBS:=1}
diff --git a/packages/flex b/packages/flex
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,14 +40,32 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
+
 
-# from sabotage
-#printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in
-#[ -n "$CROSS_COMPILE" ] && xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/')"
-export LDFLAGS="-static"
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
-# CFLAGS="$optcflags"
-autotools flex-2.6.4 --disable-nls --enable-static --disable-shared
+autotools_static flex-2.6.4 --disable-nls --enable-static --disable-shared
+check_static command/flex
+check_static command/flex++
+
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/gmp b/packages/gmp
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-j:sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,6 +40,25 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
 autotools gmp-6.1.2 --disable-nls --enable-static --disable-shared
 
diff --git a/packages/gnu-make b/packages/gnu-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.fe193ac49b4dde548726c2da5461481b0fd2b6d4f5262773311119d69ea123de
-#+busybox.348eb40a3e0240523c308856407f50941759aada1283c9b064a87bf188c13b15
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
+#+busybox.623b05721c8f2129aae460e64de5710e9962ae4bd0bec65a54abe9c36e14ca7f
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 autotools() {
@@ -9,7 +9,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -38,11 +38,30 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
+
 
-export CFLAGS="-D_GNU_SOURCE"
-export LDFLAGS="-static"
+autotools_static make-4.4.1 --disable-nls
+check_static command/make
 
-autotools make-4.4.1 --enable-static --disable-shared --disable-nls
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap
@@ -9,7 +9,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -38,6 +38,25 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
 
 mcm=/home/ccx/versions/musl-cross-make.9e72e0205ea3461afd890d31f22847a351061b712aadd7d44861fa5b3f9e1050
diff --git a/packages/libelf-compat b/packages/libelf-compat
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
 #@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:.
diff --git a/packages/libelf.h b/packages/libelf.h
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h
 #@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h
 #@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h
diff --git a/packages/linux b/packages/linux
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
-#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
-#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
-#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
-#+rsync.a98c442e2c01c7fbc2ac51f2c2eccb3e251a550eeb03c4285473a7344cc54643
-#+libelf-compat.38c09fa530e4924abebae8d2b609d7e050be7612b22b5586c81375f7f9294367
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
+#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
+#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
+#+bison.1e77c9a9664b0f73e9ba311eaac0546031d026b9642d1ab56c5ae67a44b657ad
+#+rsync.ee43ca0ffae53f31361524ff243380e0894111d5feb39b4a086f0a6456257601
+#+libelf-compat.3023655d655211fc0f061928c09b8b5374a966ea08fd54ac43ff7876a7a73f5b
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config
diff --git a/packages/logincaps b/packages/logincaps
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
 #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
 
 : ${JOBS:=1}
diff --git a/packages/m4 b/packages/m4
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 autotools() {
@@ -10,7 +10,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -39,8 +39,30 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
+
+
+autotools_static m4-1.4.19 --disable-nls
+check_static command/m4
 
-autotools m4-1.4.19 --disable-nls --enable-static --disable-shared
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/mdevd b/packages/mdevd
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
 
 : ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/mpc b/packages/mpc
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
-#+gmp.4b1ce35c3a61d41f7b2bedb950c90760308545bcfa7f33dd2afae115f13179df
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
+#+gmp.aea94b561a1ad1011f5c1101819239e74aeaf2daf211b73ab23630e95b63f0cc
 #@untar:-z:sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:.
 
 autotools() {
@@ -12,7 +12,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -41,6 +41,25 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
 autotools mpc-1.1.0 --disable-nls --enable-static --disable-shared
 
diff --git a/packages/mpfr b/packages/mpfr
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-z:sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,6 +40,25 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
 autotools mpfr-4.0.2 --disable-nls --enable-static --disable-shared
 
diff --git a/packages/musl-cross-make b/packages/musl-cross-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+musl-cross-make.9e72e0205ea3461afd890d31f22847a351061b712aadd7d44861fa5b3f9e1050
-#+gnu-make.fe193ac49b4dde548726c2da5461481b0fd2b6d4f5262773311119d69ea123de
-#+busybox.348eb40a3e0240523c308856407f50941759aada1283c9b064a87bf188c13b15
+#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
+#+busybox.623b05721c8f2129aae460e64de5710e9962ae4bd0bec65a54abe9c36e14ca7f
 #@git:fe915821b652a7fa37b34a596f47d8e20bc72338:musl-cross-make
 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz
 #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub
diff --git a/packages/netbsd-curses b/packages/netbsd-curses
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
 #@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses
 
 export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
diff --git a/packages/patch b/packages/patch
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,8 +40,30 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
+
+
+autotools_static patch-2.7.6 --disable-nls
+check_static command/patch
 
-autotools patch-2.7.6 --disable-nls --enable-static --disable-shared
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/patchelf:bootstrap b/packages/patchelf:bootstrap
@@ -8,7 +8,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -37,11 +37,30 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
-export LDFLAGS="-static"
 cd patchelf
 ./bootstrap.sh
-autotools . --enable-static --disable-shared --disable-nls
+autotools_static . --disable-nls
+check_static command/patchelf
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/popt b/packages/popt
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 autotools() {
@@ -11,7 +11,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -40,11 +40,27 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
 
-export CFLAGS="-D_GNU_SOURCE"
-export LDFLAGS="-static"
 
-autotools popt-1.19 --enable-static --disable-shared --disable-nls
+autotools_static popt-1.19 --disable-nls
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
diff --git a/packages/rsync b/packages/rsync
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
-#+popt.81c677f91b50d03e3f3bc4945841a1451d66f3a3ce81b9a4f2fe5ef90fd20e66
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
+#+popt.adfcea1cb6aed424e16f20b3f3579c7332129f040d0110c68e301688ff4d66a7
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 autotools() {
@@ -12,7 +12,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -41,17 +41,35 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 
-export CFLAGS="-D_GNU_SOURCE"
-export LDFLAGS="-static"
 
-autotools rsync-3.2.7 \
-	--enable-static --disable-shared --disable-nls \
+autotools_static rsync-3.2.7 \
+	--disable-nls \
 	--without-included-popt \
 	--disable-openssl \
 	--disable-xxhash \
 	--disable-zstd \
 	--disable-lz4 \
+check_static command/rsync
 
 
 
diff --git a/packages/s6 b/packages/s6
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
 
@@ -19,7 +19,7 @@ patch -up 1 -i ../s6_clone3_newpid.patch
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-dns b/packages/s6-dns
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
 #@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
 
 : ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-linux-init b/packages/s6-linux-init
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+s6.f9168d5a9df178b9c1196d21396b043ec5e812c4be45a7b7feccded49df8f5a9
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
 #@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init
 
 : ${JOBS:=1}
@@ -18,7 +18,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
 #@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils
 
 : ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+s6.f9168d5a9df178b9c1196d21396b043ec5e812c4be45a7b7feccded49df8f5a9
-#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
+#+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
 #@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
 
 : ${JOBS:=1}
@@ -19,7 +19,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
 #@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils
 
 : ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-rc b/packages/s6-rc
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+s6.f9168d5a9df178b9c1196d21396b043ec5e812c4be45a7b7feccded49df8f5a9
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
 #@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
 
 : ${JOBS:=1}
@@ -18,7 +18,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.f51acbba8bb0249761f331b644b8533478447273d18d29ef30500c86c18c00a0/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/skalibs b/packages/skalibs
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
 
 : ${JOBS:=1}
diff --git a/packages/snaprep b/packages/snaprep
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 : ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -1,29 +1,29 @@
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
-#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
-#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
-#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
-#+rsync.a98c442e2c01c7fbc2ac51f2c2eccb3e251a550eeb03c4285473a7344cc54643
-#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+s6.f9168d5a9df178b9c1196d21396b043ec5e812c4be45a7b7feccded49df8f5a9
-#+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
-#+s6-portable-utils.e604cd8783990cd0ee387b6587f13ca703b1cb7c379604025b6f6b9cec010e42
-#+s6-linux-utils.3d9ba05a8fc1542ed89d817c0e87b8b733c4f26820a0f827638c74ef4e414331
-#+s6-linux-init.e1efa661fba55d47641c4d9e25287ad4e1eb11a3fb356ba49c6e25fa00454f9f
-#+mdevd.32195ae02573003700555ca2c0cda4b79c370d8d0c127b14890059ff82b550ac
-#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
-#+s6-networking.fc977bc089cde121c95b471eed756105fc57c11ed0d169d2d59cfd48196912a8
-#+zsh.0ec778e7858277c0f5be933e67d229f34959bdcc9d65af18e7f5c63eb57781af
-#+pthbs-banginstall.e9f7cb14f88ae12b3ec75d09e3a048c7e935bae02c60363cc9d02f078218ae0b
-#+aat.ad0ee08a72940a3c0e781508fa81baed5a97a15e63d15f32c490407f2e3729fc
-#+confz.053f462b8fe44631e979377ac55cff1a33aad5b1eb61b78bc6a85d39cdbc9af9
-#+containers.dceb078fd8af39cbbad5e8f37c96e75406f7760cb91c93b44de1331045799171
-#+fileset.f058af8ef04d6ed8d30f2c679002130ab0c5720843aa1adb721228589f50a790
-#+logincaps.5311d501083b5ea4ff62afe4d5ebd55273f70576fdb72f0d77c87d4b6323680b
-#+snaprep.aeeb0aea12805557c5cd25c8e0d10caf44279df3290855fae4240a718f8ca5f3
-#+core-system-conf.20936155f7ad5fd5d1762de63ea5587b45e42569433479aaef5df41960b87d08
-#+core-system-rc.e96593f8f21cab2e545716139eb52fbc198e0ece184b9a47080d70b56fcd6ce0
-#+core-system-scripts.49d1a8f429e3159b684d96350a10bca5e2989ce5205581b1d3110d85ea3d1f45
-#+core-system-init.95ffda4d6c9a657ae9936f34ee238d99ffb983d982c00249c36d87d607e6d155-
\ No newline at end of file
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
+#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
+#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
+#+bison.1e77c9a9664b0f73e9ba311eaac0546031d026b9642d1ab56c5ae67a44b657ad
+#+rsync.ee43ca0ffae53f31361524ff243380e0894111d5feb39b4a086f0a6456257601
+#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
+#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
+#+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
+#+s6-linux-utils.2df7505b7f9bf745c5d27eced90a85afb83f43e055e64e6f243e5831d3800db1
+#+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
+#+mdevd.1ccacf0514eeffea88fc8203b470398b95638632eae38f1048a6f3bf5754f6dd
+#+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
+#+s6-networking.15adf950be6728a030816bedd5b2283e78e41796cea59b614b22c44690dfd6fa
+#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+aat.c70f1f2bb252b007d86535f21131b25a67ed129addab27862079ce9c5607d229
+#+confz.3b690607c9899a24124457fe3c377a00c16477c79a82573b1b697f7a8d525f18
+#+containers.b9963e9c01d8611aecc203b590b3367818d270c1734c67de3276725797942541
+#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
+#+logincaps.b1b0dda3e04cb10d342dea30de9ec9fbe61a09185abf010d1087262b507a76aa
+#+snaprep.89ad65ef8b73fc38194a17e0566fbc828d7a1f581f51519daa7f1af4e6ef4b11
+#+core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1
+#+core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88
+#+core-system-scripts.708ec1bf1d5703eae6e0471c0d38641a91dbc549da6e08ec9fe649c66e2255f3
+#+core-system-init.1cd99da19276a4fbe8e3e37c240a343df003831da5af8ff6316a8094846a1e29+
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
-#+m4.76898c5f20c21be71061296506579ba8ffe6886d664b1d9ff4cf764c12db9a47
-#+netbsd-curses.977d06f1ae0da3ed5a1c94a69e27580c17276699797349271a8411444885b9a2
+#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
+#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
+#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
+#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
+#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
+#+netbsd-curses.eb5f21732e9bb72d4736a5ae794bda2ef590f5c5c1467003718bfa8436c35237
 #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -13,7 +13,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix=/home/ccx/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -42,10 +42,10 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
-
-
-export LDFLAGS="-static -L$pthbs_build_environment/library"
-autotools zsh-5.9 --disable-dynamic --disable-locale
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
 
 check_static() {
 	local exe || true
@@ -61,6 +61,9 @@ check_static() {
 	fi
 }
 
+
+
+autotools_static zsh-5.9 --disable-locale
 check_static command/zsh
 
 
diff --git a/templates/autotools b/templates/autotools
@@ -15,7 +15,7 @@ autotools() {
 	shift
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library"
+	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
 	prefix={{versions}}/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -44,6 +44,25 @@ autotools() {
 	make DESTDIR="$pthbs_destdir" install
 }
 
+autotools_static() {
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	autotools "$@" --enable-static --disable-shared
+}
+
+check_static() {
+	local exe || true
+	exe=$pthbs_destdir/'{{versions}}'/$pthbs_package/$1
+	if ! test -f $exe; then
+		printf '%s\n' "Error: file '$1' doesn't exist!"
+		exit 1
+	fi
+	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+	if test x '!=' "x$interp_info"; then
+		printf '%s\n' "Error: '$1' is a dynamic binary!"
+		exit 1
+	fi
+}
+
 {% block at_script %}
 autotools '{{name}}'
 {% endblock %}
diff --git a/templates/pkg/bison b/templates/pkg/bison
@@ -4,9 +4,9 @@
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 {%- endblock %}
 {% block at_script %}
-export LDFLAGS="-static"
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
-autotools bison-3.8.2 --disable-nls --enable-static --disable-shared
+autotools_static bison-3.8.2 --disable-nls
+check_static command/bison
 rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias
 rmdir -p "$pthbs_destdir"/$prefix/lib || true
 {% endblock %}
diff --git a/templates/pkg/diffutils b/templates/pkg/diffutils
@@ -3,23 +3,8 @@
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 {%- endblock %}
 {% block at_script %}
-export LDFLAGS="-static"
-autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
-
-check_static() {
-	local exe || true
-	exe=$pthbs_destdir/'{{versions}}'/$pthbs_package/$1
-	if ! test -f $exe; then
-		printf '%s\n' "Error: file '$1' doesn't exist!"
-		exit 1
-	fi
-	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
-	if test x '!=' "x$interp_info"; then
-		printf '%s\n' "Error: '$1' is a dynamic binary!"
-		exit 1
-	fi
-}
 
+autotools_static diffutils-3.10 --disable-nls
 check_static command/diff
 check_static command/cmp
 
diff --git a/templates/pkg/flex b/templates/pkg/flex
@@ -3,13 +3,12 @@
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 {%- endblock %}
 {% block at_script %}
-# from sabotage
-#printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in
-#[ -n "$CROSS_COMPILE" ] && xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/')"
-export LDFLAGS="-static"
+
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
-# CFLAGS="$optcflags"
-autotools flex-2.6.4 --disable-nls --enable-static --disable-shared
+autotools_static flex-2.6.4 --disable-nls --enable-static --disable-shared
+check_static command/flex
+check_static command/flex++
+
 {% endblock %}
 {% block genlinks_begin %}
 	x["./command/flex"]=1
diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make
@@ -6,10 +6,10 @@
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 {%- endblock %}
 {% block at_script %}
-export CFLAGS="-D_GNU_SOURCE"
-export LDFLAGS="-static"
 
-autotools make-4.4.1 --enable-static --disable-shared --disable-nls
+autotools_static make-4.4.1 --disable-nls
+check_static command/make
+
 {% endblock %}
 {% block genlinks_begin %}
 	x["./command/make"]=1
diff --git a/templates/pkg/m4 b/templates/pkg/m4
@@ -7,7 +7,10 @@
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 {%- endblock %}
 {% block at_script %}
-autotools m4-1.4.19 --disable-nls --enable-static --disable-shared
+
+autotools_static m4-1.4.19 --disable-nls
+check_static command/m4
+
 {% endblock %}
 {% block genlinks_begin %}
 	x["./command/m4"]=1
diff --git a/templates/pkg/patch b/templates/pkg/patch
@@ -3,5 +3,8 @@
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 {%- endblock %}
 {% block at_script %}
-autotools patch-2.7.6 --disable-nls --enable-static --disable-shared
+
+autotools_static patch-2.7.6 --disable-nls
+check_static command/patch
+
 {% endblock %}
diff --git a/templates/pkg/patchelf:bootstrap b/templates/pkg/patchelf:bootstrap
@@ -5,10 +5,10 @@
 #@git:{{submodule.current["patchelf"]}}:patchelf
 {%- endblock %}
 {% block at_script %}
-export LDFLAGS="-static"
 cd patchelf
 ./bootstrap.sh
-autotools . --enable-static --disable-shared --disable-nls
+autotools_static . --disable-nls
+check_static command/patchelf
 {% endblock %}
 {% block genlinks_begin %}
 	x["./command/patchelf"]=1
diff --git a/templates/pkg/popt b/templates/pkg/popt
@@ -3,10 +3,7 @@
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 {%- endblock %}
 {% block at_script %}
-export CFLAGS="-D_GNU_SOURCE"
-export LDFLAGS="-static"
-
-autotools popt-1.19 --enable-static --disable-shared --disable-nls
+autotools_static popt-1.19 --disable-nls
 {% endblock %}
 {% block genlinks_begin %}
 	x["./include/popt.h"]=1
diff --git a/templates/pkg/rsync b/templates/pkg/rsync
@@ -4,16 +4,15 @@
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 {%- endblock %}
 {% block at_script %}
-export CFLAGS="-D_GNU_SOURCE"
-export LDFLAGS="-static"
 
-autotools rsync-3.2.7 \
-	--enable-static --disable-shared --disable-nls \
+autotools_static rsync-3.2.7 \
+	--disable-nls \
 	--without-included-popt \
 	--disable-openssl \
 	--disable-xxhash \
 	--disable-zstd \
 	--disable-lz4 \
+check_static command/rsync
 
 {% endblock %}
 {% block genlinks_begin %}
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -6,23 +6,7 @@
 {%- endblock %}
 {% block at_script %}
 
-export LDFLAGS="-static -L$pthbs_build_environment/library"
-autotools zsh-5.9 --disable-dynamic --disable-locale
-
-check_static() {
-	local exe || true
-	exe=$pthbs_destdir/'{{versions}}'/$pthbs_package/$1
-	if ! test -f $exe; then
-		printf '%s\n' "Error: file '$1' doesn't exist!"
-		exit 1
-	fi
-	interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
-	if test x '!=' "x$interp_info"; then
-		printf '%s\n' "Error: '$1' is a dynamic binary!"
-		exit 1
-	fi
-}
-
+autotools_static zsh-5.9 --disable-locale
 check_static command/zsh
 
 {% endblock %}

	pthbs Packaging Through Hashed Build Scripts
	git clone https://ccx.te2000.cz/git/pthbs
	Log \| Files \| Refs \| Submodules \| README

M	packages/aat	\|	6	+++---
M	packages/bison	\|	37	++++++++++++++++++++++++++++---------
M	packages/bootstrap.environment	\|	4	++--
M	packages/busybox	\|	6	+++---
M	packages/busybox-diffutils	\|	2	+-
M	packages/busybox-login	\|	2	+-
M	packages/busybox:bootstrap	\|	4	++--
M	packages/confz	\|	6	+++---
M	packages/containers	\|	8	++++----
M	packages/core-system-conf	\|	10	+++++-----
M	packages/core-system-init	\|	18	+++++++++---------
M	packages/core-system-rc	\|	12	++++++------
M	packages/core-system-scripts	\|	6	+++---
M	packages/default.environment	\|	62	+++++++++++++++++++++++++++++++-------------------------------
M	packages/diffutils	\|	22	+++++++++++++---------
M	packages/elf.h	\|	2	+-
M	packages/elfutils	\|	33	++++++++++++++++++++++++++-------
M	packages/execline	\|	10	+++++-----
M	packages/fileset	\|	6	+++---
M	packages/flex	\|	42	++++++++++++++++++++++++++++++------------
M	packages/gmp	\|	31	+++++++++++++++++++++++++------
M	packages/gnu-make	\|	33	++++++++++++++++++++++++++-------
M	packages/gnu-make:bootstrap	\|	21	++++++++++++++++++++-
M	packages/libelf-compat	\|	6	+++---
M	packages/libelf.h	\|	2	+-
M	packages/linux	\|	18	+++++++++---------
M	packages/logincaps	\|	10	+++++-----
M	packages/m4	\|	34	++++++++++++++++++++++++++++------
M	packages/mdevd	\|	12	++++++------
M	packages/mpc	\|	33	++++++++++++++++++++++++++-------
M	packages/mpfr	\|	31	+++++++++++++++++++++++++------
M	packages/musl-cross-make	\|	4	++--
M	packages/netbsd-curses	\|	6	+++---
M	packages/patch	\|	36	+++++++++++++++++++++++++++++-------
M	packages/patchelf:bootstrap	\|	25	++++++++++++++++++++++---
M	packages/popt	\|	34	+++++++++++++++++++++++++---------
M	packages/pthbs-banginstall	\|	4	++--
M	packages/rsync	\|	40	+++++++++++++++++++++++++++++-----------
M	packages/s6	\|	14	+++++++-------
M	packages/s6-dns	\|	10	+++++-----
M	packages/s6-linux-init	\|	14	+++++++-------
M	packages/s6-linux-utils	\|	10	+++++-----
M	packages/s6-networking	\|	16	++++++++--------
M	packages/s6-portable-utils	\|	10	+++++-----
M	packages/s6-rc	\|	14	+++++++-------
M	packages/skalibs	\|	6	+++---
M	packages/snaprep	\|	6	+++---
M	packages/userspace.environment	\|	60	++++++++++++++++++++++++++++++------------------------------
M	packages/zsh	\|	25	++++++++++++++-----------
M	templates/autotools	\|	21	++++++++++++++++++++-
M	templates/pkg/bison	\|	4	++--
M	templates/pkg/diffutils	\|	17	+----------------
M	templates/pkg/flex	\|	11	+++++------
M	templates/pkg/gnu-make	\|	6	+++---
M	templates/pkg/m4	\|	5	++++-
M	templates/pkg/patch	\|	5	++++-
M	templates/pkg/patchelf:bootstrap	\|	4	++--
M	templates/pkg/popt	\|	5	+----
M	templates/pkg/rsync	\|	7	+++----
M	templates/pkg/zsh	\|	18	+-----------------