Split pkg shell functions into includable files, add modules to zsh - pthbs

commit 9b22e5dee1c5386414bc7760c5935c623fd851a0
parent 2120abd6c216b080ea8d682c03f492f828a56d39
Author: ccx <ccx@te2000.cz>
Date:   Mon, 26 Feb 2024 20:02:50 +0000

Split pkg shell functions into includable files, add modules to zsh

Diffstat:
M command/pthbs-build  | 1 +
M packages/aat  | 6 +++---
M packages/bison  | 44 +++++++++++++++++++-------------------------
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/curl  | 44 +++++++++++++++++++-------------------------
M packages/default.environment  | 68 ++++++++++++++++++++++++++++++++++----------------------------------
M packages/diffutils  | 42 ++++++++++++++++++------------------------
M packages/elf.h  | 2 +-
M packages/elfutils  | 44 +++++++++++++++++++-------------------------
M packages/execline  | 10 +++++-----
M packages/fileset  | 6 +++---
M packages/flex  | 42 ++++++++++++++++++------------------------
M packages/git  | 14 +++++++-------
M packages/gnu-make  | 38 ++++++++++++++++----------------------
M packages/gnu-make:bootstrap  | 32 +++++++++++++-------------------
M packages/kernel.environment  | 4 ++--
M packages/libelf-compat  | 6 +++---
M packages/libelf.h  | 2 +-
M packages/libressl  | 42 ++++++++++++++++++------------------------
M packages/linux  | 18 +++++++++---------
M packages/logincaps  | 10 +++++-----
M packages/m4  | 40 +++++++++++++++++-----------------------
M packages/mdevd  | 12 ++++++------
M packages/musl-cross-make  | 4 ++--
M packages/netbsd-curses  | 6 +++---
M packages/patch  | 42 ++++++++++++++++++------------------------
M packages/patchelf:bootstrap  | 32 +++++++++++++-------------------
M packages/popt  | 42 ++++++++++++++++++------------------------
M packages/pthbs-banginstall  | 4 ++--
M packages/rsync  | 46 ++++++++++++++++++++--------------------------
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  | 18 +++++++++---------
M packages/s6-portable-utils  | 10 +++++-----
M packages/s6-rc  | 14 +++++++-------
M packages/skalibs  | 6 +++---
M packages/snaprep  | 6 +++---
M packages/userspace.environment  | 58 +++++++++++++++++++++++++++++-----------------------------
M packages/zsh  | 54 ++++++++++++++++++++++++++----------------------------
M templates/autotools  | 56 +++-----------------------------------------------------
A templates/functions/autotools  | 40 ++++++++++++++++++++++++++++++++++++++++
A templates/functions/build_env_dynamic  | 5 +++++
A templates/functions/build_env_static  | 5 +++++
A templates/functions/check_static  | 13 +++++++++++++
M templates/pkg/zsh  | 10 +++++++---

57 files changed, 531 insertions(+), 593 deletions(-)
diff --git a/command/pthbs-build b/command/pthbs-build
@@ -261,6 +261,7 @@ else
 	mkdir -p "$logdir"
 	rm -v "$(dirname "$logdir")/last_failed_build"
 	ln -v -s -f "$(basename "$logdir")" "$(dirname "$logdir")/last_failed_build"
+	find "$workdir" -name config.log -exec cp -v --backup=numbered '{}' "$logdir/config.log" \;
 	pthbs-digest-tree >"$logdir/workdir-digest" "$workdir"
 fi
 
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 : ${JOBS:=1}
diff --git a/packages/bison b/packages/bison
@@ -1,18 +1,18 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
-#+flex.84d049ae50e0c098c58b7c32a5df5c47d2274f0acb0f87116eafff9b39ba0042
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
+#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -26,26 +26,21 @@ autotools() {
 		--docdir="$prefix/doc/bison" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -60,7 +55,6 @@ check_static() {
 	fi
 }
 
-
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
 autotools_static bison-3.8.2 --disable-nls
 check_static command/bison
diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment
@@ -1,3 +1,3 @@
-#+busybox.4a822ea63a3b15cf3a44dd3f09b0f7e28f5b7e03e19b431e92b3c5e809beab0d
-#+gnu-make.24414b8ead76d22d761057a729c6e943ce312fa13f6e2b40bdc06acfd094e441
+#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7
+#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4
 #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f 
\ 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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.24414b8ead76d22d761057a729c6e943ce312fa13f6e2b40bdc06acfd094e441
-#+busybox.4a822ea63a3b15cf3a44dd3f09b0f7e28f5b7e03e19b431e92b3c5e809beab0d
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4
+#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7
 #@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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/packages/busybox-login b/packages/busybox-login
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap
@@ -2,13 +2,13 @@
 #@pragma:nosandbox
 #@pragma:nopath
 #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f
-#+gnu-make.24414b8ead76d22d761057a729c6e943ce312fa13f6e2b40bdc06acfd094e441
+#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 : ${JOBS:=1}
 mcm=/versions/musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f
-make=/versions/gnu-make.24414b8ead76d22d761057a729c6e943ce312fa13f6e2b40bdc06acfd094e441
+make=/versions/gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4
 
 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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 : ${JOBS:=1}
diff --git a/packages/containers b/packages/containers
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
 #@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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+diffutils.cd5e6d19ef67c893ebdcef5c8f6d1edadc5a30ca666eccd0e7b70f91bebfba3c
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+aat.4b2a5f2705d503f73fe2e3fee1b03cb9fbc485b287b95034847b0ab21a14acdd
-#+fileset.bc29f12746ed676a8bbbb92186f292818fa981b0102cf4cfa04e17a0762db351
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+aat.83aa17b8710a0aec5f2197195ade9b26f66e0b6a68f1498e4f0fec0acc982827
+#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
 #@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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+s6.a583523fea18952da7d8e563708e26c7494426feeb22d43cc659603f67ba80b9
-#+s6-rc.2277e844933817e9416d08a8b55c91172f3fb35e0099eeb63bbf08905975822c
-#+s6-portable-utils.dab409fb433c9b7159e71801c5ff69b71d8df229a6f9639c84bcc6fb1dacca11
-#+s6-linux-init.0f79538f715c8f876ba149dee43e54a3699c0b124f0d3c164e42b9875d300184
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+core-system-rc.e61cfeb5ee616060880b9e9c7f40f0153a350c7ff482c9208d1164c6b888215a
-
-s6rcdb=/versions/core-system-rc.e61cfeb5ee616060880b9e9c7f40f0153a350c7ff482c9208d1164c6b888215a/s6-rc-db
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2
+#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04
+#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f
+#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+core-system-rc.392e6f19f9592ee8cdc25c42026deb51acf9778563c5951c0f3d13f8254931f7
+
+s6rcdb=/versions/core-system-rc.392e6f19f9592ee8cdc25c42026deb51acf9778563c5951c0f3d13f8254931f7/s6-rc-db
 prefix=/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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+s6-rc.2277e844933817e9416d08a8b55c91172f3fb35e0099eeb63bbf08905975822c
-#+fileset.bc29f12746ed676a8bbbb92186f292818fa981b0102cf4cfa04e17a0762db351
-#+core-system-conf.5e522306708288f8d37dd6035f8d12e4237d2e43cc90d8f89ed9dc64656f8f99
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04
+#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
+#+core-system-conf.41c8c5fd3c819a28eef71a119b19044af282166dc388e363d1671bfb99e7fc5a
 
-conf=/versions/core-system-conf.5e522306708288f8d37dd6035f8d12e4237d2e43cc90d8f89ed9dc64656f8f99/core-system-conf
+conf=/versions/core-system-conf.41c8c5fd3c819a28eef71a119b19044af282166dc388e363d1671bfb99e7fc5a/core-system-conf
 prefix=/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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts
 
 : ${JOBS:=1}
diff --git a/packages/curl b/packages/curl
@@ -1,18 +1,18 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
-#+libressl.f767278416adf29df32c538436035c71f6fb4ff2a8b81e6a9399b9d7d9cdbb08
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
+#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -26,26 +26,21 @@ autotools() {
 		--docdir="$prefix/doc/curl" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -61,7 +56,6 @@ check_static() {
 }
 
 
-
 # Do not generate manpages (requires Perl)
 (
 	cd curl-8.6.0
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,33 +1,33 @@
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+diffutils.cd5e6d19ef67c893ebdcef5c8f6d1edadc5a30ca666eccd0e7b70f91bebfba3c
-#+patch.de25db42b64273ba67101aa9a7cad7fe9d2ed95845e93a0a0d5cec03a5c30882
-#+flex.84d049ae50e0c098c58b7c32a5df5c47d2274f0acb0f87116eafff9b39ba0042
-#+bison.f948026b027043ee48072bf2a2f8e49ef3ef0441b542187b474a95ccf84ea70e
-#+rsync.2e1a900b2e6d10cc2ffea901d5116f83adda31429df2b84152b5bb9ab6d33ad8
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+s6.a583523fea18952da7d8e563708e26c7494426feeb22d43cc659603f67ba80b9
-#+s6-rc.2277e844933817e9416d08a8b55c91172f3fb35e0099eeb63bbf08905975822c
-#+s6-portable-utils.dab409fb433c9b7159e71801c5ff69b71d8df229a6f9639c84bcc6fb1dacca11
-#+s6-linux-utils.3b98c746955cd95e97979f2abec13ecd2c63fa897fd4795dbe42ce3051667ea3
-#+s6-linux-init.0f79538f715c8f876ba149dee43e54a3699c0b124f0d3c164e42b9875d300184
-#+mdevd.55421efb7e3716e0daa92c826e3785052e5a8bbf465c72f9fb917f816932d930
-#+s6-dns.ab74de2ec618c798c255c4fa7319a29a176230ec0b751be89e8853483079e264
-#+libressl.f767278416adf29df32c538436035c71f6fb4ff2a8b81e6a9399b9d7d9cdbb08
-#+s6-networking.7f5e944547e8f6ce8bf0e607420aa05b06daaa6f7c1cba0f82a269b907591e28
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
-#+aat.4b2a5f2705d503f73fe2e3fee1b03cb9fbc485b287b95034847b0ab21a14acdd
-#+confz.2ce31f421f2ce0b597110fcd7256f72f4287ead9bea1a1c9988804c6c8a7a6e6
-#+containers.42df49241fde80739e7ec1aee67d5ba43ce8c08f955648a653b93a2c47384df9
-#+fileset.bc29f12746ed676a8bbbb92186f292818fa981b0102cf4cfa04e17a0762db351
-#+logincaps.de566b57965c7729ba0a1db49d0f372a6b7273a5da757bd5ac7887ff19292946
-#+snaprep.e64df1ab92ddeb7a0299f2e34fffff4c4923517795ed9d70e83cff484a9cf515
-#+curl.c8598abba276b38abce8bb460950c587a4cd6f886bc72abf08a49740ff76c633
-#+git.0b3055a2a4e2a93ee11a10e7d0223d22e8ed114232aeec15bffd411e0c6bc4bc
-#+linux.9fa277504f4642463f3c0828eb92bfc8c2535fae1a59f1300e567ad33ba8e9b0
-#+core-system-conf.5e522306708288f8d37dd6035f8d12e4237d2e43cc90d8f89ed9dc64656f8f99
-#+core-system-rc.e61cfeb5ee616060880b9e9c7f40f0153a350c7ff482c9208d1164c6b888215a
-#+core-system-scripts.8005185b768db024da05fd396e0e317f7a0decf47d4b2586aa0c6516031bfaf1
-#+core-system-init.8fb422cdbae606dd0e164fd845a30bb0a02e557307bd5e63198bd9436d07528f-
\ No newline at end of file
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
+#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251
+#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12
+#+bison.6ce08f01ee3e0ab2066de6f4c31eed79120ba3e0ebce6dc2130b35a55477fbda
+#+rsync.7b7fc81bf3d24b81c643385b5e1938f5a15d9e6ee2d26b81b73017aaac2faa68
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2
+#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04
+#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f
+#+s6-linux-utils.051b3255e88d176e4179f9262f489d7f4e1e2f799d226056e282eced67c1256f
+#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576
+#+mdevd.87eef0d9758ee67151321a12faa9a4d55a132dff95b3ee5df845b1c1ef3cf96b
+#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c
+#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
+#+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+aat.83aa17b8710a0aec5f2197195ade9b26f66e0b6a68f1498e4f0fec0acc982827
+#+confz.7b280bc8cb3d418373229b4e17bd54ab0a1f98a95a9b5942d777bd46dc7c3d89
+#+containers.37f021525d12f1ef84f1f4efdc092ac98beffffb07189dbcd4f1969c4fb5db28
+#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
+#+logincaps.c2dd7ebf56d5e34435f92980287e394e06e961b75bb2fedf7d74e90cdb4e02bd
+#+snaprep.b1f70988bfd13a33964a1bcaaca7cc5d86e998a3b24eb57e6bb25b58de3a2915
+#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
+#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9
+#+linux.c5fe89bcf8fcccecb1d966791fc3fdf15cce0225905b6421064a25d5a961ddb4
+#+core-system-conf.41c8c5fd3c819a28eef71a119b19044af282166dc388e363d1671bfb99e7fc5a
+#+core-system-rc.392e6f19f9592ee8cdc25c42026deb51acf9778563c5951c0f3d13f8254931f7
+#+core-system-scripts.faf544fe4a24fa75357273b052305196df9c889aba9bddbcba92da92f1ed688c
+#+core-system-init.6d4fc441751e8d7a2686ea291675688e8562dd7547c8abeb8006c5a2bf68e177+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -1,17 +1,17 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -25,26 +25,21 @@ autotools() {
 		--docdir="$prefix/doc/diffutils" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -60,7 +55,6 @@ check_static() {
 }
 
 
-
 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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h
 
 installdir="$pthbs_destdir//versions/$pthbs_package"
diff --git a/packages/elfutils b/packages/elfutils
@@ -1,17 +1,17 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
 #@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -25,26 +25,21 @@ autotools() {
 		--docdir="$prefix/doc/elfutils" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -59,9 +54,8 @@ check_static() {
 	fi
 }
 
-
 export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference"
-export LDFLAGS="-static -L/versions/musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7/lib"
+export LDFLAGS="-static -L/versions/musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
 #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
 
 : ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
 #@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
 
 : ${JOBS:=1}
diff --git a/packages/flex b/packages/flex
@@ -1,17 +1,17 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -25,26 +25,21 @@ autotools() {
 		--docdir="$prefix/doc/flex" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -60,7 +55,6 @@ check_static() {
 }
 
 
-
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
 export LDFLAGS="--static"
 autotools_static flex-2.6.4 --disable-nls
diff --git a/packages/git b/packages/git
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
-#+libressl.f767278416adf29df32c538436035c71f6fb4ff2a8b81e6a9399b9d7d9cdbb08
-#+curl.c8598abba276b38abce8bb460950c587a4cd6f886bc72abf08a49740ff76c633
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
+#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
+#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 check_static() {
diff --git a/packages/gnu-make b/packages/gnu-make
@@ -1,15 +1,15 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.24414b8ead76d22d761057a729c6e943ce312fa13f6e2b40bdc06acfd094e441
-#+busybox.4a822ea63a3b15cf3a44dd3f09b0f7e28f5b7e03e19b431e92b3c5e809beab0d
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4
+#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -23,26 +23,21 @@ autotools() {
 		--docdir="$prefix/doc/gnu-make" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -58,7 +53,6 @@ check_static() {
 }
 
 
-
 autotools_static make-4.4.1 --disable-nls
 check_static command/make
 
diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap
@@ -4,12 +4,12 @@
 #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -23,26 +23,21 @@ autotools() {
 		--docdir="$prefix/doc/gnu-make:bootstrap" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -58,7 +53,6 @@ check_static() {
 }
 
 
-
 mcm=/versions/musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f
 
 export PATH="$mcm/bin:$PATH"
diff --git a/packages/kernel.environment b/packages/kernel.environment
@@ -1 +1 @@
-#+linux.9fa277504f4642463f3c0828eb92bfc8c2535fae1a59f1300e567ad33ba8e9b0-
\ No newline at end of file
+#+linux.c5fe89bcf8fcccecb1d966791fc3fdf15cce0225905b6421064a25d5a961ddb4+
\ No newline at end of file
diff --git a/packages/libelf-compat b/packages/libelf-compat
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #@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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h
 #@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h
 #@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h
diff --git a/packages/libressl b/packages/libressl
@@ -1,17 +1,17 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -25,26 +25,21 @@ autotools() {
 		--docdir="$prefix/doc/libressl" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -60,7 +55,6 @@ check_static() {
 }
 
 
-
 export LDFLAGS="--static"
 autotools_static libressl-3.8.2
 check_static command/openssl
diff --git a/packages/linux b/packages/linux
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+diffutils.cd5e6d19ef67c893ebdcef5c8f6d1edadc5a30ca666eccd0e7b70f91bebfba3c
-#+patch.de25db42b64273ba67101aa9a7cad7fe9d2ed95845e93a0a0d5cec03a5c30882
-#+flex.84d049ae50e0c098c58b7c32a5df5c47d2274f0acb0f87116eafff9b39ba0042
-#+bison.f948026b027043ee48072bf2a2f8e49ef3ef0441b542187b474a95ccf84ea70e
-#+rsync.2e1a900b2e6d10cc2ffea901d5116f83adda31429df2b84152b5bb9ab6d33ad8
-#+libelf-compat.f5fd4a9cb966339770688f7c9244002f4ef2519d3cdd3624d35c931ed192cfb6
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
+#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251
+#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12
+#+bison.6ce08f01ee3e0ab2066de6f4c31eed79120ba3e0ebce6dc2130b35a55477fbda
+#+rsync.7b7fc81bf3d24b81c643385b5e1938f5a15d9e6ee2d26b81b73017aaac2faa68
+#+libelf-compat.e9c36311b84eb7e7e36596e51fab4031cf94e751fe6ac2ef45bbc95b7cc289a1
 #@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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
 #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
 
 : ${JOBS:=1}
diff --git a/packages/m4 b/packages/m4
@@ -1,16 +1,16 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -24,26 +24,21 @@ autotools() {
 		--docdir="$prefix/doc/m4" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -59,7 +54,6 @@ check_static() {
 }
 
 
-
 autotools_static m4-1.4.19 --disable-nls
 check_static command/m4
 
diff --git a/packages/mdevd b/packages/mdevd
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
 #@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
 
 : ${JOBS:=1}
@@ -15,7 +15,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/musl-cross-make b/packages/musl-cross-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f
-#+gnu-make.24414b8ead76d22d761057a729c6e943ce312fa13f6e2b40bdc06acfd094e441
-#+busybox.4a822ea63a3b15cf3a44dd3f09b0f7e28f5b7e03e19b431e92b3c5e809beab0d
+#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4
+#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7
 #@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.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
 #@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,17 +1,17 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -25,26 +25,21 @@ autotools() {
 		--docdir="$prefix/doc/patch" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -60,7 +55,6 @@ check_static() {
 }
 
 
-
 autotools_static patch-2.7.6 --disable-nls
 check_static command/patch
 
diff --git a/packages/patchelf:bootstrap b/packages/patchelf:bootstrap
@@ -3,12 +3,12 @@
 #@pragma:nopath
 #@git:7c2f768bf9601268a4e71c2ebe91e2011918a70f:patchelf
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -22,26 +22,21 @@ autotools() {
 		--docdir="$prefix/doc/patchelf:bootstrap" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -56,7 +51,6 @@ check_static() {
 	fi
 }
 
-
 cd patchelf
 ./bootstrap.sh
 autotools_static . --disable-nls
diff --git a/packages/popt b/packages/popt
@@ -1,17 +1,17 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -25,26 +25,21 @@ autotools() {
 		--docdir="$prefix/doc/popt" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -59,7 +54,6 @@ check_static() {
 	fi
 }
 
-
 autotools_static popt-1.19 --disable-nls
 
 
diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 installdir="$pthbs_destdir//versions/$pthbs_package"
diff --git a/packages/rsync b/packages/rsync
@@ -1,19 +1,19 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
-#+popt.9cadd1be75ec0d54189505c3bb885422ee8120fc243504397e248ed02c22de76
-#+libressl.f767278416adf29df32c538436035c71f6fb4ff2a8b81e6a9399b9d7d9cdbb08
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
+#+popt.6806563bd151522c2f0fe3ca45f5e929e15d09fb3f1d1545fa82e744820f78b9
+#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -27,26 +27,21 @@ autotools() {
 		--docdir="$prefix/doc/rsync" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -62,7 +57,6 @@ check_static() {
 }
 
 
-
 autotools_static rsync-3.2.7 \
 	--disable-nls \
 	--without-included-popt \
diff --git a/packages/s6 b/packages/s6
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+patch.de25db42b64273ba67101aa9a7cad7fe9d2ed95845e93a0a0d5cec03a5c30882
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
 #@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='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
 #@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
 
 : ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+s6.a583523fea18952da7d8e563708e26c7494426feeb22d43cc659603f67ba80b9
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2
 #@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init
 
 : ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
 #@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils
 
 : ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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,12 +1,12 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+s6.a583523fea18952da7d8e563708e26c7494426feeb22d43cc659603f67ba80b9
-#+s6-dns.ab74de2ec618c798c255c4fa7319a29a176230ec0b751be89e8853483079e264
-#+libressl.f767278416adf29df32c538436035c71f6fb4ff2a8b81e6a9399b9d7d9cdbb08
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2
+#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c
+#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
 #@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
 
 : ${JOBS:=1}
@@ -18,7 +18,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
 #@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils
 
 : ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+s6.a583523fea18952da7d8e563708e26c7494426feeb22d43cc659603f67ba80b9
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2
 #@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
 
 : ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.3ccb881645c7170b3bb36b6e951fcf794de10b203b9990f3a9bf057741fb1c5e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/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.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
 
 : ${JOBS:=1}
diff --git a/packages/snaprep b/packages/snaprep
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 : ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -1,28 +1,28 @@
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+diffutils.cd5e6d19ef67c893ebdcef5c8f6d1edadc5a30ca666eccd0e7b70f91bebfba3c
-#+patch.de25db42b64273ba67101aa9a7cad7fe9d2ed95845e93a0a0d5cec03a5c30882
-#+flex.84d049ae50e0c098c58b7c32a5df5c47d2274f0acb0f87116eafff9b39ba0042
-#+bison.f948026b027043ee48072bf2a2f8e49ef3ef0441b542187b474a95ccf84ea70e
-#+rsync.2e1a900b2e6d10cc2ffea901d5116f83adda31429df2b84152b5bb9ab6d33ad8
-#+execline.5b6049c359d9809d68a40ba117eeece2b18bc4b10ccfe1e3d2ec5649992007bc
-#+s6.a583523fea18952da7d8e563708e26c7494426feeb22d43cc659603f67ba80b9
-#+s6-rc.2277e844933817e9416d08a8b55c91172f3fb35e0099eeb63bbf08905975822c
-#+s6-portable-utils.dab409fb433c9b7159e71801c5ff69b71d8df229a6f9639c84bcc6fb1dacca11
-#+s6-linux-utils.3b98c746955cd95e97979f2abec13ecd2c63fa897fd4795dbe42ce3051667ea3
-#+s6-linux-init.0f79538f715c8f876ba149dee43e54a3699c0b124f0d3c164e42b9875d300184
-#+mdevd.55421efb7e3716e0daa92c826e3785052e5a8bbf465c72f9fb917f816932d930
-#+s6-dns.ab74de2ec618c798c255c4fa7319a29a176230ec0b751be89e8853483079e264
-#+libressl.f767278416adf29df32c538436035c71f6fb4ff2a8b81e6a9399b9d7d9cdbb08
-#+s6-networking.7f5e944547e8f6ce8bf0e607420aa05b06daaa6f7c1cba0f82a269b907591e28
-#+zsh.25e7b6f968092fbc7f1ba04ed4c75bab3152a7e26aea237a441eb5d3c5477634
-#+pthbs-banginstall.e80f53c94368df7af58c5dc7df7f6c4e26a730b0d44402bb6205d626bf3045a4
-#+aat.4b2a5f2705d503f73fe2e3fee1b03cb9fbc485b287b95034847b0ab21a14acdd
-#+confz.2ce31f421f2ce0b597110fcd7256f72f4287ead9bea1a1c9988804c6c8a7a6e6
-#+containers.42df49241fde80739e7ec1aee67d5ba43ce8c08f955648a653b93a2c47384df9
-#+fileset.bc29f12746ed676a8bbbb92186f292818fa981b0102cf4cfa04e17a0762db351
-#+logincaps.de566b57965c7729ba0a1db49d0f372a6b7273a5da757bd5ac7887ff19292946
-#+snaprep.e64df1ab92ddeb7a0299f2e34fffff4c4923517795ed9d70e83cff484a9cf515
-#+curl.c8598abba276b38abce8bb460950c587a4cd6f886bc72abf08a49740ff76c633
-#+git.0b3055a2a4e2a93ee11a10e7d0223d22e8ed114232aeec15bffd411e0c6bc4bc-
\ No newline at end of file
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
+#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251
+#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12
+#+bison.6ce08f01ee3e0ab2066de6f4c31eed79120ba3e0ebce6dc2130b35a55477fbda
+#+rsync.7b7fc81bf3d24b81c643385b5e1938f5a15d9e6ee2d26b81b73017aaac2faa68
+#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
+#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2
+#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04
+#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f
+#+s6-linux-utils.051b3255e88d176e4179f9262f489d7f4e1e2f799d226056e282eced67c1256f
+#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576
+#+mdevd.87eef0d9758ee67151321a12faa9a4d55a132dff95b3ee5df845b1c1ef3cf96b
+#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c
+#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
+#+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee
+#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+aat.83aa17b8710a0aec5f2197195ade9b26f66e0b6a68f1498e4f0fec0acc982827
+#+confz.7b280bc8cb3d418373229b4e17bd54ab0a1f98a95a9b5942d777bd46dc7c3d89
+#+containers.37f021525d12f1ef84f1f4efdc092ac98beffffb07189dbcd4f1969c4fb5db28
+#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
+#+logincaps.c2dd7ebf56d5e34435f92980287e394e06e961b75bb2fedf7d74e90cdb4e02bd
+#+snaprep.b1f70988bfd13a33964a1bcaaca7cc5d86e998a3b24eb57e6bb25b58de3a2915
+#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
+#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9+
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -1,19 +1,18 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b9aa13c1ccc2720c8c988a8b6d45c87b19e0ff77031add77f64c094de83615e7
-#+gnu-make.8f342c6f85f9f9ec464b7007c5da9644437dcfa18f7ba5981555a0705f788f60
-#+busybox.e18ea2d5d968f6a54e4b9cc9dd4a599c345a7bab46a775ea39e2c35b9853abd9
-#+busybox-diffutils.0c4fd7dbc0542d8309f288edc391c7d2d6d8ebce5a8d8c97604633838a49f505
-#+m4.98c9913740abbae1090962dbc854300942004465eeb2cb5d6be2379771b18190
-#+netbsd-curses.a20270f95ce054ffb5ec47fca9d3e08f17acb15d5ffb591489cd53fa656070c0
-#@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh
+#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
+#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
+#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
+#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
+#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
+#+netbsd-curses.9f6c8437de9bc082a51cb44c88ec317d1822028750b8724ff24b802f41b99b39
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
-autotools() {
-	cd "$1"
-	shift
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
-	export CFLAGS="-L$pthbs_build_environment/library -D_GNU_SOURCE $CFLAGS"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
 	prefix=/versions/$pthbs_package
 	./configure -C \
 		--prefix="$prefix" \
@@ -27,26 +26,21 @@ autotools() {
 		--docdir="$prefix/doc/zsh" \
 		--localstatedir='/home/ccx/.local/var' \
 		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
+
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
 	make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 	make DESTDIR="$pthbs_destdir" install
 }
 
 autotools_static() {
-	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+	build_env_static
 	autotools "$@" --enable-static --disable-shared
 }
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -61,9 +55,13 @@ check_static() {
 	fi
 }
 
-
-
-autotools_static zsh-5.9 --disable-locale
+build_env_static
+cd zsh-5.9
+autotools_config --enable-libc-musl --enable-static --disable-shared --disable-locale
+sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
+cat config.modules
+make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+make DESTDIR="$pthbs_destdir" install
 check_static command/zsh
 
 
diff --git a/templates/autotools b/templates/autotools
@@ -10,59 +10,9 @@
 {%- block extra_deps %}
 {%- endblock %}
 
-autotools() {
-	cd "$1"
-	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 -D_GNU_SOURCE $CFLAGS"
-	prefix={{versions}}/$pthbs_package
-	./configure -C \
-		--prefix="$prefix" \
-		--build="$(${CC:-gcc} -dumpmachine)" \
-		--bindir="$prefix/command" \
-		--sbindir="$prefix/command" \
-		--infodir="$prefix/info" \
-		--localedir="$prefix/locale" \
-		--mandir="$prefix/man" \
-		--libdir="$prefix/library" \
-		--docdir="$prefix/doc/{{name}}" \
-		--localstatedir='{{var_dir}}' \
-		"$@"
-		# --libexecdir=DIR        program executables [EPREFIX/libexec]
-		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-		# --includedir=DIR        C header files [PREFIX/include]
-		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-		
-	# ac_cv_func_malloc_0_nonnull=yes \
-	# ac_cv_func_realloc_0_nonnull=yes
-	{{make}}
-	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
-}
-
+{% include "functions/build_env_static" %}
+{% include "functions/autotools" %}
+{% include "functions/check_static" %}
 {% block at_script %}
 autotools '{{name}}'
 {% endblock %}
diff --git a/templates/functions/autotools b/templates/functions/autotools
@@ -0,0 +1,40 @@
+autotools_config() {
+	prefix={{versions}}/$pthbs_package
+	./configure -C \
+		--prefix="$prefix" \
+		--build="$(${CC:-gcc} -dumpmachine)" \
+		--bindir="$prefix/command" \
+		--sbindir="$prefix/command" \
+		--infodir="$prefix/info" \
+		--localedir="$prefix/locale" \
+		--mandir="$prefix/man" \
+		--libdir="$prefix/library" \
+		--docdir="$prefix/doc/{{name}}" \
+		--localstatedir='{{var_dir}}' \
+		"$@"
+{#
+		# --libexecdir=DIR        program executables [EPREFIX/libexec]
+		# --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+		# --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+		# --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+		# --includedir=DIR        C header files [PREFIX/include]
+		# --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+		# --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+		# --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+	# ac_cv_func_malloc_0_nonnull=yes \
+	# ac_cv_func_realloc_0_nonnull=yes
+#}
+}
+
+autotools() {
+	cd "$1"
+	shift
+	autotools_config "$@"
+	{{make}}
+	make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+	build_env_static
+	autotools "$@" --enable-static --disable-shared
+}
diff --git a/templates/functions/build_env_dynamic b/templates/functions/build_env_dynamic
@@ -0,0 +1,5 @@
+build_env_dynamic() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library.so"
+	export CPATH="$pthbs_build_environment/include"
+	export LDFLAGS="-L$pthbs_build_environment/library.so $LDFLAGS"
+}
diff --git a/templates/functions/build_env_static b/templates/functions/build_env_static
@@ -0,0 +1,5 @@
+build_env_static() {
+	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
+	export CPATH="$pthbs_build_environment/include"
+	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
diff --git a/templates/functions/check_static b/templates/functions/check_static
@@ -0,0 +1,13 @@
+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
+}
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -1,12 +1,16 @@
 {% extends "autotools" %}
 {%- block extra_deps %}
 #+{{pkg_install_name("netbsd-curses")}}
-#@git:{{submodule.current["zsh"]}}:zsh
 #@untar:-J:{{downloads["zsh-5.9.tar.xz"]}}:.
 {%- endblock %}
 {% block at_script %}
-
-autotools_static zsh-5.9 --disable-locale
+build_env_static
+cd zsh-5.9
+autotools_config --enable-libc-musl --enable-static --disable-shared --disable-locale
+sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
+cat config.modules
+{{make}}
+make DESTDIR="$pthbs_destdir" install
 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	command/pthbs-build	\|	1	+
M	packages/aat	\|	6	+++---
M	packages/bison	\|	44	+++++++++++++++++++-------------------------
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/curl	\|	44	+++++++++++++++++++-------------------------
M	packages/default.environment	\|	68	++++++++++++++++++++++++++++++++++----------------------------------
M	packages/diffutils	\|	42	++++++++++++++++++------------------------
M	packages/elf.h	\|	2	+-
M	packages/elfutils	\|	44	+++++++++++++++++++-------------------------
M	packages/execline	\|	10	+++++-----
M	packages/fileset	\|	6	+++---
M	packages/flex	\|	42	++++++++++++++++++------------------------
M	packages/git	\|	14	+++++++-------
M	packages/gnu-make	\|	38	++++++++++++++++----------------------
M	packages/gnu-make:bootstrap	\|	32	+++++++++++++-------------------
M	packages/kernel.environment	\|	4	++--
M	packages/libelf-compat	\|	6	+++---
M	packages/libelf.h	\|	2	+-
M	packages/libressl	\|	42	++++++++++++++++++------------------------
M	packages/linux	\|	18	+++++++++---------
M	packages/logincaps	\|	10	+++++-----
M	packages/m4	\|	40	+++++++++++++++++-----------------------
M	packages/mdevd	\|	12	++++++------
M	packages/musl-cross-make	\|	4	++--
M	packages/netbsd-curses	\|	6	+++---
M	packages/patch	\|	42	++++++++++++++++++------------------------
M	packages/patchelf:bootstrap	\|	32	+++++++++++++-------------------
M	packages/popt	\|	42	++++++++++++++++++------------------------
M	packages/pthbs-banginstall	\|	4	++--
M	packages/rsync	\|	46	++++++++++++++++++++--------------------------
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	\|	18	+++++++++---------
M	packages/s6-portable-utils	\|	10	+++++-----
M	packages/s6-rc	\|	14	+++++++-------
M	packages/skalibs	\|	6	+++---
M	packages/snaprep	\|	6	+++---
M	packages/userspace.environment	\|	58	+++++++++++++++++++++++++++++-----------------------------
M	packages/zsh	\|	54	++++++++++++++++++++++++++----------------------------
M	templates/autotools	\|	56	+++-----------------------------------------------------
A	templates/functions/autotools	\|	40	++++++++++++++++++++++++++++++++++++++++
A	templates/functions/build_env_dynamic	\|	5	+++++
A	templates/functions/build_env_static	\|	5	+++++
A	templates/functions/check_static	\|	13	+++++++++++++
M	templates/pkg/zsh	\|	10	+++++++---