mrrl

commit 95004da40c9dbbe8501731fce0c166f31efb0ee9
parent 6c126ceb9e72c9c9db838f49c0b63dad3b305a7f
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 12:57:47 +0100

Static curses utilities

Diffstat:
M
packages/aat
 | 
4
++--
M
packages/confz
 | 
4
++--
M
packages/containers
 | 
4
++--
M
packages/core-system-conf
 | 
4
++--
M
packages/core-system-init
 | 
4
++--
M
packages/core-system-rc
 | 
6
+++---
M
packages/core-system-scripts
 | 
4
++--
M
packages/default.environment
 | 
24
++++++++++++------------
M
packages/fileset
 | 
4
++--
M
packages/logincaps
 | 
4
++--
M
packages/netbsd-curses
 | 
1
+
M
packages/pthbs-banginstall
 | 
2
+-
M
packages/snaprep
 | 
4
++--
M
packages/userspace.environment
 | 
26
+++++++++++++-------------
M
packages/zsh
 | 
2
+-
M
templates/pkg/netbsd-curses
 | 
1
+

16 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 : ${JOBS:=1}
diff --git a/packages/confz b/packages/confz
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 : ${JOBS:=1}
diff --git a/packages/containers b/packages/containers
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers
 
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -2,8 +2,8 @@
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
 #+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
-#+aat.c70f1f2bb252b007d86535f21131b25a67ed129addab27862079ce9c5607d229
-#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
+#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
+#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
 #@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
 
 : ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,9 +5,9 @@
 #+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
 #+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
 #+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88
+#+core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1
 
-s6rcdb=/home/ccx/versions/core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88/s6-rc-db
+s6rcdb=/home/ccx/versions/core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1/s6-rc-db
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -2,10 +2,10 @@
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
 #+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
-#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
-#+core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1
+#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
+#+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85
 
-conf=/home/ccx/versions/core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1/core-system-conf
+conf=/home/ccx/versions/core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85/core-system-conf
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/core-system-scripts b/packages/core-system-scripts
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts
 
 : ${JOBS:=1}
diff --git a/packages/default.environment b/packages/default.environment
@@ -15,16 +15,16 @@
 #+mdevd.1ccacf0514eeffea88fc8203b470398b95638632eae38f1048a6f3bf5754f6dd
 #+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
 #+s6-networking.15adf950be6728a030816bedd5b2283e78e41796cea59b614b22c44690dfd6fa
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
-#+aat.c70f1f2bb252b007d86535f21131b25a67ed129addab27862079ce9c5607d229
-#+confz.3b690607c9899a24124457fe3c377a00c16477c79a82573b1b697f7a8d525f18
-#+containers.b9963e9c01d8611aecc203b590b3367818d270c1734c67de3276725797942541
-#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
-#+logincaps.b1b0dda3e04cb10d342dea30de9ec9fbe61a09185abf010d1087262b507a76aa
-#+snaprep.89ad65ef8b73fc38194a17e0566fbc828d7a1f581f51519daa7f1af4e6ef4b11
-#+core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1
-#+core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88
-#+core-system-scripts.708ec1bf1d5703eae6e0471c0d38641a91dbc549da6e08ec9fe649c66e2255f3
-#+core-system-init.1cd99da19276a4fbe8e3e37c240a343df003831da5af8ff6316a8094846a1e29
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
+#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
+#+confz.22f90e5b155ace65fd78ebe7f4c12d6ae9ddc3af14c51ddb99f9c47e19d39cdb
+#+containers.de880d8cacbb87b0a30e88654c81e291178ecd2c3717de59e0a64f694a8da8b8
+#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
+#+logincaps.0296b3435c8943a4138dbe4ccbb27d29cee31f1437c74b4c45218fb77873b10a
+#+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46
+#+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85
+#+core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1
+#+core-system-scripts.a6948d0ca8f36e41bf5f0ec5acc13bc2fc6c9787282984ff089482ee5c587a9d
+#+core-system-init.c55889e425a8c194b5a6954cd9345290f68caacbdbfff152b79eb7eff67607b1
 #+linux.f938eeb3075dc9de68ed066b8beec8e1c95a04920417dc303fbaab4779220293 
\ No newline at end of file
diff --git a/packages/fileset b/packages/fileset
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
 
 : ${JOBS:=1}
diff --git a/packages/logincaps b/packages/logincaps
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
 #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
diff --git a/packages/netbsd-curses b/packages/netbsd-curses
@@ -5,6 +5,7 @@
 #@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses
 
 export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
+export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 export CPATH="$pthbs_build_environment/include"
 
diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
diff --git a/packages/snaprep b/packages/snaprep
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 : ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -15,15 +15,15 @@
 #+mdevd.1ccacf0514eeffea88fc8203b470398b95638632eae38f1048a6f3bf5754f6dd
 #+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
 #+s6-networking.15adf950be6728a030816bedd5b2283e78e41796cea59b614b22c44690dfd6fa
-#+zsh.48bd5775aac6798085829974f70d39277e62bfb956525e3c2495ace405d379f8
-#+pthbs-banginstall.ea0f0cf0edb3ff66a7e7a3216b0f50adf228960d1b10e7b370362d0547bca673
-#+aat.c70f1f2bb252b007d86535f21131b25a67ed129addab27862079ce9c5607d229
-#+confz.3b690607c9899a24124457fe3c377a00c16477c79a82573b1b697f7a8d525f18
-#+containers.b9963e9c01d8611aecc203b590b3367818d270c1734c67de3276725797942541
-#+fileset.11c855131882c07116a73e2ce4e2364300bbcc6fa044ea218edbca9d4aaed440
-#+logincaps.b1b0dda3e04cb10d342dea30de9ec9fbe61a09185abf010d1087262b507a76aa
-#+snaprep.89ad65ef8b73fc38194a17e0566fbc828d7a1f581f51519daa7f1af4e6ef4b11
-#+core-system-conf.3594c6a81668589fbe445014354863115449ef3d9d59c712699d74af29cf3bb1
-#+core-system-rc.cfa918a6e8b3f0334343b5b2b74342a9bc85e1fc39c91678638c160260decc88
-#+core-system-scripts.708ec1bf1d5703eae6e0471c0d38641a91dbc549da6e08ec9fe649c66e2255f3
-#+core-system-init.1cd99da19276a4fbe8e3e37c240a343df003831da5af8ff6316a8094846a1e29-
\ No newline at end of file
+#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
+#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
+#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
+#+confz.22f90e5b155ace65fd78ebe7f4c12d6ae9ddc3af14c51ddb99f9c47e19d39cdb
+#+containers.de880d8cacbb87b0a30e88654c81e291178ecd2c3717de59e0a64f694a8da8b8
+#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
+#+logincaps.0296b3435c8943a4138dbe4ccbb27d29cee31f1437c74b4c45218fb77873b10a
+#+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46
+#+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85
+#+core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1
+#+core-system-scripts.a6948d0ca8f36e41bf5f0ec5acc13bc2fc6c9787282984ff089482ee5c587a9d
+#+core-system-init.c55889e425a8c194b5a6954cd9345290f68caacbdbfff152b79eb7eff67607b1+
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -4,7 +4,7 @@
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
 #+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
-#+netbsd-curses.eb5f21732e9bb72d4736a5ae794bda2ef590f5c5c1467003718bfa8436c35237
+#+netbsd-curses.7701457c3fc4ff5dc1a7ad26d559d92a0726214bfcf3334c7cb244d0b5802553
 #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/templates/pkg/netbsd-curses b/templates/pkg/netbsd-curses
@@ -6,6 +6,7 @@
 #@git:{{submodule.current["netbsd-curses"]}}:curses
 
 export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
+export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 export CPATH="$pthbs_build_environment/include"