commit e1240156c6b0dd9e27aa3014d6297d01a46e54da
parent ef24ec608c2be9e7246db7334a16cbfc72742e51
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Fri, 16 Jun 2023 02:09:23 +0200
Install ./command directory
Diffstat:
21 files changed, 134 insertions(+), 95 deletions(-)
diff --git a/packages/busybox b/packages/busybox
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
-#+busybox.9eea98edadaac634b82079a4493c29eaa21700f840d76336466340c7ff534aed
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
+#+busybox.24e09e8518e7813ebe328088ca433dc6bb18d757a231cad1b741925978594381
#@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
#@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap
@@ -4,8 +4,8 @@
#@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
: ${JOBS:=1}
-mcm=/home/ccx/versions/musl-cross-make.aaaff5e3281705bd84754e3e7af8829ba6350b8a520b455d310a3a5f32cdf120
-make=/home/ccx/versions/gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
+mcm=/home/ccx/versions/musl-cross-make.e5bc9e4ecd0e65047e4c21da3d4bcee19d30759f57c73204afd3a684ec6057cb
+make=/home/ccx/versions/gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
export PATH="$mcm/bin:$make/bin:$PATH"
export CC="$mcm/bin/x86_64-linux-musl-gcc"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,13 +1,13 @@
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+execline.bf7abe6c42100f6d10de8fce4c9b6d2879887b8e629bdda60214781680292eb6
-#+s6.8c7aebd121449a138cb2901fdf5f4d28c08e4ebf547094fdf3b20366eab17b3d
-#+s6-rc.82cd1c0129e2931d3ce5a0f87c68975f8d1718fd39bf58ce5f86db47e82932ff
-#+s6-portable-utils.4eac242634e759a9da20bf0e7b2f8b41cc248d97b05947c56b1321f5407493d5
-#+s6-linux-utils.5f428fd3f213e746dc703dd5fc06b2179293cd1791bc34590b883fbb003351d4
-#+s6-linux-init.863fd837322c69c2e92a9d75661c483a72e853f5438cb62be926b3b5d12406ea
-#+mdevd.cd38a8e0d5b9494e35597d3c260b3710fc54c2020c2de4ad78a18ad53e196a6f
-#+s6-dns.5fd84dae00e72969ebeb48aeaddfe4ed717127d66fd1c73413f071419f1df3b9
-#+s6-networking.b9d93d7943d89450f426f0cecf82c9febd56d5f4972d3edf39c30afb20e225f8
-#+flex.c06b5bc14da41d80bd3be3c6bafdf5c8623e5b08175d6cbb943768844db9c328-
\ No newline at end of file
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
+#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
+#+s6-rc.a6dc3b73906f00ea0c0b4b79b4c078a1755216f2df67881fe498d37de71d989b
+#+s6-portable-utils.e1e77a67da692909ffd69c1b51c20615bd21c5f544a11c6e11381da12f8d5f2d
+#+s6-linux-utils.44817a9e975d448973d139760234c44872c065092aa0cd079a6f48d0d9167c88
+#+s6-linux-init.fe18c04def36a6262836c9de394b5994bf4e599fa36cd397f0c5e19e1a40cc23
+#+mdevd.296110307918b59fdb5646fd2a7ae303182309b1f503e824d00b48ef586a89d9
+#+s6-dns.7b189bf3e92f45cafafad343a5dda1378d7c07ec34224424645050259525282d
+#+s6-networking.39b0559e83eaa8d39ee954d9ebb64b5f9fcfad968815c5b1b54fd34434c2d54b
+#+flex.94c0f941aac3aada367039ee718f9b3e5b96caeeb9f439441a1e1b58e65c8542+
\ No newline at end of file
diff --git a/packages/execline b/packages/execline
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
#@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 'execline'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -47,6 +47,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/flex b/packages/flex
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+m4.eaea879a1913330fe4b4366112c9ffc4929d436116505690cd0720b2759e1a23
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+m4.fb7716874499d4d3d54c6c868742dd64b6aee2f9dd455aa5eab735e47a2818ff
#@untar:-vz:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
autotools() {
@@ -73,6 +73,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/gnu-make b/packages/gnu-make
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
-#+busybox.9eea98edadaac634b82079a4493c29eaa21700f840d76336466340c7ff534aed
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
+#+busybox.24e09e8518e7813ebe328088ca433dc6bb18d757a231cad1b741925978594381
#@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
: ${JOBS:=1}
@@ -15,7 +15,18 @@ export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
cd make-4.4.1
-./configure -C --prefix="/home/ccx/versions/$pthbs_package" --build="$($CC -dumpmachine)" --disable-nls
+./configure -C \
+ --prefix="$prefix" \
+ --build="$($CC -dumpmachine)" \
+ --bindir="$prefix/command" \
+ --sbindir="$prefix/command" \
+ --infodir="$prefix/info" \
+ --localedir="$prefix/locale" \
+ --mandir="$prefix/man" \
+ --libdir="$prefix/library.so" \
+ --docdir="$prefix/doc/gnu-make" \
+ --localstatedir='/home/ccx/.local/var' \
+ --enable-static --disable-shared --disable-nls
make -j${JOBS:-1} -l$((1+${JOBS:-1}))
make DESTDIR="$pthbs_destdir" install-strip
@@ -43,6 +54,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap
@@ -3,7 +3,7 @@
#@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
: ${JOBS:=1}
-mcm=/home/ccx/versions/musl-cross-make.aaaff5e3281705bd84754e3e7af8829ba6350b8a520b455d310a3a5f32cdf120
+mcm=/home/ccx/versions/musl-cross-make.e5bc9e4ecd0e65047e4c21da3d4bcee19d30759f57c73204afd3a684ec6057cb
export PATH="$mcm/bin:$PATH"
export CC="$mcm/bin/x86_64-linux-musl-gcc"
@@ -40,6 +40,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/m4 b/packages/m4
@@ -1,12 +1,12 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
#@untar:-vz:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
autotools() {
@@ -68,6 +68,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/mdevd b/packages/mdevd
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
-#+execline.bf7abe6c42100f6d10de8fce4c9b6d2879887b8e629bdda60214781680292eb6
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
#@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
: ${JOBS:=1}
@@ -18,7 +18,7 @@ cd 'mdevd'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -48,6 +48,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/musl-cross-make b/packages/musl-cross-make
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.aaaff5e3281705bd84754e3e7af8829ba6350b8a520b455d310a3a5f32cdf120
-#+gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
-#+busybox.9eea98edadaac634b82079a4493c29eaa21700f840d76336466340c7ff534aed
+#+musl-cross-make.e5bc9e4ecd0e65047e4c21da3d4bcee19d30759f57c73204afd3a684ec6057cb
+#+gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
+#+busybox.24e09e8518e7813ebe328088ca433dc6bb18d757a231cad1b741925978594381
#@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
@@ -47,6 +47,7 @@ $1!="."{exit 1}
$2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) }
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/musl-cross-make:bootstrap b/packages/musl-cross-make:bootstrap
@@ -40,6 +40,7 @@ $1!="."{exit 1}
$2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) }
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6 b/packages/s6
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
-#+execline.bf7abe6c42100f6d10de8fce4c9b6d2879887b8e629bdda60214781680292eb6
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
#@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
@@ -19,7 +19,7 @@ patch -up 1 -i ../s6_clone3_newpid.patch
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -49,6 +49,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6-dns b/packages/s6-dns
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
#@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 's6-dns'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -47,6 +47,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6-linux-init b/packages/s6-linux-init
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
-#+execline.bf7abe6c42100f6d10de8fce4c9b6d2879887b8e629bdda60214781680292eb6
-#+s6.8c7aebd121449a138cb2901fdf5f4d28c08e4ebf547094fdf3b20366eab17b3d
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
+#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
#@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init
: ${JOBS:=1}
@@ -19,7 +19,7 @@ cd 's6-linux-init'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -49,6 +49,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
#@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 's6-linux-utils'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -47,6 +47,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -1,12 +1,12 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
-#+execline.bf7abe6c42100f6d10de8fce4c9b6d2879887b8e629bdda60214781680292eb6
-#+s6.8c7aebd121449a138cb2901fdf5f4d28c08e4ebf547094fdf3b20366eab17b3d
-#+s6-dns.5fd84dae00e72969ebeb48aeaddfe4ed717127d66fd1c73413f071419f1df3b9
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
+#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
+#+s6-dns.7b189bf3e92f45cafafad343a5dda1378d7c07ec34224424645050259525282d
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
: ${JOBS:=1}
@@ -20,7 +20,7 @@ cd 's6-networking'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -50,6 +50,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
#@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 's6-portable-utils'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -47,6 +47,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/s6-rc b/packages/s6-rc
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
-#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
-#+execline.bf7abe6c42100f6d10de8fce4c9b6d2879887b8e629bdda60214781680292eb6
-#+s6.8c7aebd121449a138cb2901fdf5f4d28c08e4ebf547094fdf3b20366eab17b3d
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
+#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
#@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
: ${JOBS:=1}
@@ -19,7 +19,7 @@ cd 's6-rc'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -49,6 +49,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/packages/skalibs b/packages/skalibs
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
-#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
-#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
+#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
+#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
+#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
#@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
: ${JOBS:=1}
@@ -48,6 +48,7 @@ $1!="."{exit 1}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/templates/genlinks b/templates/genlinks
@@ -26,6 +26,7 @@ $1!="."{exit 1}
{% block rules %}
{% endblock -%}
$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
+$2 == "command" { link($0)); next }
$2 == "bin" { link(s1("command", $0)); next }
$2 == "include" { link($0); next }
$2 == "library.so" { link($0); next }
diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make
@@ -16,7 +16,18 @@ export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
cd make-4.4.1
-./configure -C --prefix="{{versions}}/$pthbs_package" --build="$($CC -dumpmachine)" --disable-nls
+./configure -C \
+ --prefix="$prefix" \
+ --build="$($CC -dumpmachine)" \
+ --bindir="$prefix/command" \
+ --sbindir="$prefix/command" \
+ --infodir="$prefix/info" \
+ --localedir="$prefix/locale" \
+ --mandir="$prefix/man" \
+ --libdir="$prefix/library.so" \
+ --docdir="$prefix/doc/{{name}}" \
+ --localstatedir='{{var_dir}}' \
+ --enable-static --disable-shared --disable-nls
{{make}}
make DESTDIR="$pthbs_destdir" install-strip
