commit 5884f3c18a27cdea3c9cbca76d2f31ea054d39ae
parent cea5b847bc43cb180a9bdec057955b6bdd17f14f
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Sat, 17 Jun 2023 18:30:14 +0200
m4, bison, update genlinks
Diffstat:
30 files changed, 604 insertions(+), 246 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -2,6 +2,7 @@ dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 2348200 https:/
8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd 1125800 https://github.com/libcgroup/libcgroup/releases/download/v3.0/libcgroup-3.0.0.tar.gz
e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 1419096 https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70 2953876 https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.gz
+9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 2817324 https://ftp.gnu.org/gnu/bison/bison-3.8.2.tar.xz
# musl-cross-make
ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf 21490848 https://ftpmirror.gnu.org/gnu/binutils/binutils-2.33.1.tar.xz
diff --git a/packages/bison b/packages/bison
@@ -0,0 +1,102 @@
+#!/usr/bin/env pthbs-build
+#+*
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+m4.924a391389646e3b9656fe13e899e31fa0903384dce76b65830edf7dbccf0557
+#+flex.cfcf27b6421ac626f667ed4c55d6a5c034555c320bafd06310edf6e849eb4b5f
+#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
+
+autotools() {
+ cd "$1"
+ shift
+ export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+ export CPATH="$pthbs_build_environment/include"
+ prefix=/home/ccx/versions/$pthbs_package
+ ./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/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
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+
+export LDFLAGS="-static"
+export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
+autotools bison-3.8.2 --disable-nls --enable-static --disable-shared
+rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias
+rmdir -p "$pthbs_destdir"/$prefix/lib || true
+
+
+cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
+find -type d -o -print | awk -F/ '
+BEGIN {
+ x["./command/bison"]=1
+}
+
+function r1(s) {
+ sub("^[.]/[^/]*", ".", s)
+ return s
+}
+function s1(repl, s) {
+ sub("^[.]/[^/]*", "./"repl, s)
+ return s
+}
+function link(src) {
+ x[$0]=0
+ printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
+}
+$1!="."{exit 1}
+
+
+$2 == "command" { link($0); next }
+$2 == "bin" { link(s1("command", $0)); next }
+
+$2 == "library.so" { link($0); next }
+$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
+
+END {
+ for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+ for(fname in x) {
+ if(x[fname]) {
+ printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
+ exit 3
+ }
+ }
+}' >.install-links.new
+mv .install-links.new .install-links
diff --git a/packages/busybox b/packages/busybox
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
-#+busybox.24e09e8518e7813ebe328088ca433dc6bb18d757a231cad1b741925978594381
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.5a3ea32d78aa7a67390d110b9f44c88e8254bd8503a91a7ceef5ae7bc56d49d5
+#+busybox.b9094196ca61dd443f1a2d734e8ab616adf15bd671d70d3df6166df7484763c0
#@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
#@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap
@@ -4,16 +4,16 @@
#@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
: ${JOBS:=1}
-mcm=/home/ccx/versions/musl-cross-make.e5bc9e4ecd0e65047e4c21da3d4bcee19d30759f57c73204afd3a684ec6057cb
-make=/home/ccx/versions/gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
+mcm=/home/ccx/versions/musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6
+make=/home/ccx/versions/gnu-make.5a3ea32d78aa7a67390d110b9f44c88e8254bd8503a91a7ceef5ae7bc56d49d5
-export PATH="$mcm/bin:$make/bin:$PATH"
+export PATH="$mcm/bin:$make/command:$PATH"
export CC="$mcm/bin/x86_64-linux-musl-gcc"
export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
cd busybox
-$make/bin/make V=1 CROSS_COMPILE=x86_64-linux-musl- LDFLAGS=-static HOSTLDFLAGS=-static \
+$make/command/make V=1 CROSS_COMPILE=x86_64-linux-musl- LDFLAGS=-static HOSTLDFLAGS=-static \
HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j$JOBS
mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package/command"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,13 +1,14 @@
-#+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
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
+#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
+#+s6-rc.82010888589835401d602ab42e2a6114fe76eb9afc517d477a2c7d36d04c5e04
+#+s6-portable-utils.d80acaa1fa389e9e8c9d384b19c48157d4f5a8b1a116a570a5866dd6c1e613d2
+#+s6-linux-utils.7ea2f48cf8f8ecf36ee3bbf9b1e9c2e9dcc7bddd3c266d469d4d3bb35550d726
+#+s6-linux-init.4bed05368099fecd9f033f57ee5fc95bcdd6debfc0c30614e9b933b462bb7a75
+#+mdevd.324377b2f5f3a087d6b3a7cc6b6db03bf16a342cc7990011d4b62dcb2d449328
+#+s6-dns.91cc3d4afd51493b74adef73c831aa7c72fd927f1f044b8f2b3407986e8e87de
+#+s6-networking.232731abc6c89da986ed9e47e1c24fb43e7ecb6a0bbcd31e5ca476bf299e026b
+#+flex.cfcf27b6421ac626f667ed4c55d6a5c034555c320bafd06310edf6e849eb4b5f
+#+bison.1c72d1149e28aa1bb9103da2324a9ea370ba585621b0fc7f8595fc239f456c1e+
\ 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.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -42,17 +42,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/flex b/packages/flex
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+m4.fb7716874499d4d3d54c6c868742dd64b6aee2f9dd455aa5eab735e47a2818ff
-#@untar:-vz:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+m4.924a391389646e3b9656fe13e899e31fa0903384dce76b65830edf7dbccf0557
+#@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
autotools() {
cd "$1"
@@ -54,7 +54,7 @@ find -type d -o -print | awk -F/ '
BEGIN {
x["./command/flex"]=1
x["./command/flex++"]=1
- x["./command/lex"]=1
+ #x["./command/lex"]=1
}
function r1(s) {
@@ -68,17 +68,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/gnu-make b/packages/gnu-make
@@ -1,41 +1,55 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
-#+busybox.24e09e8518e7813ebe328088ca433dc6bb18d757a231cad1b741925978594381
-#@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.5a3ea32d78aa7a67390d110b9f44c88e8254bd8503a91a7ceef5ae7bc56d49d5
+#+busybox.b9094196ca61dd443f1a2d734e8ab616adf15bd671d70d3df6166df7484763c0
+#@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+
+autotools() {
+ cd "$1"
+ shift
+ export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+ export CPATH="$pthbs_build_environment/include"
+ prefix=/home/ccx/versions/$pthbs_package
+ ./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' \
+ "$@"
+ # --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 -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
-: ${JOBS:=1}
-export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc"
-export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++"
-export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld"
-export AR="$pthbs_build_environment/command/x86_64-linux-musl-ar"
export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
-cd make-4.4.1
-./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
+autotools make-4.4.1 --enable-static --disable-shared --disable-nls
-make -j${JOBS:-1} -l$((1+${JOBS:-1}))
-make DESTDIR="$pthbs_destdir" install-strip
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
- x["./bin/make"]=1
- x["./share/man/man1/make.1"]=1
+ x["./command/make"]=1
+ x["./man/man1/make.1"]=1
}
function r1(s) {
@@ -49,17 +63,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap
@@ -1,9 +1,43 @@
#!/usr/bin/env pthbs-build
#+*
-#@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+#@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+
+autotools() {
+ cd "$1"
+ shift
+ export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
+ export CPATH="$pthbs_build_environment/include"
+ prefix=/home/ccx/versions/$pthbs_package
+ ./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: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
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
-: ${JOBS:=1}
-mcm=/home/ccx/versions/musl-cross-make.e5bc9e4ecd0e65047e4c21da3d4bcee19d30759f57c73204afd3a684ec6057cb
+
+mcm=/home/ccx/versions/musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6
export PATH="$mcm/bin:$PATH"
export CC="$mcm/bin/x86_64-linux-musl-gcc"
@@ -11,17 +45,14 @@ export CXX="$mcm/bin/x86_64-linux-musl-g++"
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
+autotools make-4.4.1 --enable-static --disable-shared --disable-nls
-make -j$JOBS -l$(1+JOBS)
-make DESTDIR="$pthbs_destdir" install-strip
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
- x["./bin/make"]=1
- x["./share/man/man1/make.1"]=1
+ x["./command/make"]=1
+ x["./man/man1/make.1"]=1
}
function r1(s) {
@@ -35,17 +66,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/m4 b/packages/m4
@@ -1,13 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#@untar:-vz:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
autotools() {
cd "$1"
@@ -63,17 +59,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/mdevd b/packages/mdevd
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
-#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -43,17 +43,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/musl-cross-make b/packages/musl-cross-make
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e5bc9e4ecd0e65047e4c21da3d4bcee19d30759f57c73204afd3a684ec6057cb
-#+gnu-make.b5714275d8db3273f788832cda99705a9a44c0669fb28632c86554c12b100019
-#+busybox.24e09e8518e7813ebe328088ca433dc6bb18d757a231cad1b741925978594381
+#+musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6
+#+gnu-make.5a3ea32d78aa7a67390d110b9f44c88e8254bd8503a91a7ceef5ae7bc56d49d5
+#+busybox.b9094196ca61dd443f1a2d734e8ab616adf15bd671d70d3df6166df7484763c0
#@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
@@ -41,18 +41,31 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$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 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
-$2 == "include" { link($0); next }
+
$2 == "library.so" { link($0); next }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/musl-cross-make:bootstrap b/packages/musl-cross-make:bootstrap
@@ -34,18 +34,31 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$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 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
-$2 == "include" { link($0); next }
+
$2 == "library.so" { link($0); next }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6 b/packages/s6
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
-#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -44,17 +44,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6-dns b/packages/s6-dns
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -42,17 +42,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6-linux-init b/packages/s6-linux-init
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
-#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
-#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
+#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -44,17 +44,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -42,17 +42,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -1,12 +1,12 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
-#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
-#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
-#+s6-dns.7b189bf3e92f45cafafad343a5dda1378d7c07ec34224424645050259525282d
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
+#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
+#+s6-dns.91cc3d4afd51493b74adef73c831aa7c72fd927f1f044b8f2b3407986e8e87de
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -45,17 +45,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -42,17 +42,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/s6-rc b/packages/s6-rc
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
-#+skalibs.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a
-#+execline.e78531b6abf9c3fa9cb560d9c6e2d6a55e0a0f0d1dbf9b899ea87be3bfa274de
-#+s6.6865040f205e20b871edd35446b563eda37c3117ddf734bf5191be82a95b3bb7
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
+#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
#@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.6dba01aab34bb6d7075e98a5b09e441f44e28361f7dd6ea7d57f0b2c92e2092a/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
@@ -44,17 +44,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/packages/skalibs b/packages/skalibs
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
#+*
-#+musl-cross-make.e8aade8b61a632326fadd3680ec1fe863224cea63bcabaae9dbcb56ff9519417
-#+gnu-make.b179e0cf397160a9e0e3b373f5915defc55d0bcd8f97245e08dd34f47f3831c2
-#+busybox.1ecad1e3c4b989d3b75a1d0634f17bc576ed2e48f81122f7be0326aa2b9bfd33
+#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
+#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
+#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
#@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
: ${JOBS:=1}
@@ -43,17 +43,30 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/templates/autotools b/templates/autotools
@@ -1,9 +1,11 @@
{% extends "genlinks" %}
{%- block script %}
+{%- block default_deps %}
#+*
#+{{pkg_install_name("musl-cross-make")}}
#+{{pkg_install_name("gnu-make")}}
#+{{pkg_install_name("busybox")}}
+{%- endblock %}
{%- block extra_deps %}
{%- endblock %}
diff --git a/templates/genlinks b/templates/genlinks
@@ -20,18 +20,31 @@ function s1(repl, s) {
function link(src) {
x[$0]=0
printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
}
$1!="."{exit 1}
{% block rules %}
{% endblock -%}
-$2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
-$2 == "command" { link($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 }
-$2 == "lib" { link(s1("library.so", $0)); next }
$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
END {
for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/templates/pkg/bison b/templates/pkg/bison
@@ -0,0 +1,16 @@
+{% extends "autotools" %}
+{%- block extra_deps %}
+#+{{pkg_install_name("m4")}}
+#+{{pkg_install_name("flex")}}
+#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
+{%- endblock %}
+{% block at_script %}
+export LDFLAGS="-static"
+export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
+autotools bison-3.8.2 --disable-nls --enable-static --disable-shared
+rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias
+rmdir -p "$pthbs_destdir"/$prefix/lib || true
+{% endblock %}
+{% block genlinks_begin %}
+ x["./command/bison"]=1
+{% endblock %}
diff --git a/templates/pkg/busybox:bootstrap b/templates/pkg/busybox:bootstrap
@@ -8,13 +8,13 @@
mcm={{pkg_install_dir("musl-cross-make:bootstrap")}}
make={{pkg_install_dir("gnu-make:bootstrap")}}
-export PATH="$mcm/bin:$make/bin:$PATH"
+export PATH="$mcm/bin:$make/command:$PATH"
export CC="$mcm/bin/{{triplet}}-gcc"
export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
cd busybox
-$make/bin/make V=1 CROSS_COMPILE={{triplet}}- LDFLAGS=-static HOSTLDFLAGS=-static \
+$make/command/make V=1 CROSS_COMPILE={{triplet}}- LDFLAGS=-static HOSTLDFLAGS=-static \
HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j$JOBS
mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package/command"
diff --git a/templates/pkg/default.environment b/templates/pkg/default.environment
@@ -11,3 +11,4 @@
#+{{pkg_install_name("s6-dns")}}
#+{{pkg_install_name("s6-networking")}}
#+{{pkg_install_name("flex")}}
+#+{{pkg_install_name("bison")}}
diff --git a/templates/pkg/flex b/templates/pkg/flex
@@ -1,7 +1,7 @@
{% extends "autotools" %}
{%- block extra_deps %}
#+{{pkg_install_name("m4")}}
-#@untar:-vz:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
+#@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
{%- endblock %}
{% block at_script %}
# from sabotage
@@ -15,5 +15,5 @@ autotools flex-2.6.4 --disable-nls --enable-static --disable-shared
{% block genlinks_begin %}
x["./command/flex"]=1
x["./command/flex++"]=1
- x["./command/lex"]=1
+ #x["./command/lex"]=1
{% endblock %}
diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make
@@ -1,38 +1,18 @@
-{% extends "genlinks" %}
-{%- block script %}
+{% extends "autotools" %}
+{%- block default_deps %}
#+*
#+{{pkg_install_name("musl-cross-make")}}
#+{{pkg_install_name("gnu-make:bootstrap")}}
#+{{pkg_install_name("busybox:bootstrap")}}
-#@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
-
-: ${JOBS:=1}
-
-export CC="$pthbs_build_environment/command/{{triplet}}-gcc"
-export CXX="$pthbs_build_environment/command/{{triplet}}-g++"
-export LD="$pthbs_build_environment/command/{{triplet}}-ld"
-export AR="$pthbs_build_environment/command/{{triplet}}-ar"
+#@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+{%- endblock %}
+{% block at_script %}
export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
-cd make-4.4.1
-./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
+autotools make-4.4.1 --enable-static --disable-shared --disable-nls
{% endblock %}
{% block genlinks_begin %}
- x["./bin/make"]=1
- x["./share/man/man1/make.1"]=1
+ x["./command/make"]=1
+ x["./man/man1/make.1"]=1
{% endblock %}
diff --git a/templates/pkg/gnu-make:bootstrap b/templates/pkg/gnu-make:bootstrap
@@ -1,9 +1,10 @@
-{% extends "genlinks" %}
-{%- block script %}
+{% extends "autotools" %}
+{%- block default_deps %}
#+*
-#@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+#@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
+{%- endblock %}
+{% block at_script %}
-: ${JOBS:=1}
mcm={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap")}}
export PATH="$mcm/bin:$PATH"
@@ -12,13 +13,9 @@ export CXX="$mcm/bin/{{triplet}}-g++"
export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
-cd make-4.4.1
-./configure -C --prefix="{{versions}}/$pthbs_package" --build="$($CC -dumpmachine)" --disable-nls
-
-make -j$JOBS -l$(1+JOBS)
-make DESTDIR="$pthbs_destdir" install-strip
+autotools make-4.4.1 --enable-static --disable-shared --disable-nls
{% endblock %}
{% block genlinks_begin %}
- x["./bin/make"]=1
- x["./share/man/man1/make.1"]=1
+ x["./command/make"]=1
+ x["./man/man1/make.1"]=1
{% endblock %}
diff --git a/templates/pkg/m4 b/templates/pkg/m4
@@ -1,10 +1,6 @@
{% extends "autotools" %}
{%- block extra_deps %}
-#+*
-#+{{pkg_install_name("musl-cross-make")}}
-#+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("busybox")}}
-#@untar:-vz:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
+#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
{%- endblock %}
{% block at_script %}
autotools m4-1.4.19 --disable-nls --enable-static --disable-shared
