pthbs

commit 65ef11a8d042db4101b16da3c9e4af090bb29841
parent a1ed09346b3288b66c2536b8551194d26588c14e
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Tue, 13 Jun 2023 14:03:48 +0200

Add several library directories to genlinks

Diffstat:
M
Makefile
 | 
2
++
M
packages/busybox
 | 
6
+++---
M
packages/busybox:bootstrap
 | 
4
++--
M
packages/default.environment
 | 
10
+++++-----
M
packages/execline
 | 
14
+++++++-------
M
packages/gnu-make
 | 
8
++++----
M
packages/gnu-make:bootstrap
 | 
4
++--
M
packages/musl-cross-make
 | 
8
++++----
M
packages/musl-cross-make:bootstrap
 | 
2
+-
M
packages/skalibs
 | 
8
++++----
M
templates/genlinks
 | 
2
+-

11 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/Makefile b/Makefile
@@ -8,6 +8,8 @@ VERSIONS:=$(HOME)/versions
 #		cp -va environments/current "environments/installed.$(date +%s)" \
 #	fi
 
+export PATH:=$(CURDIR)/command:$(PATH)
+
 default: default.environment
 
 $(VERSIONS)/environment.%/.env:
diff --git a/packages/busybox b/packages/busybox
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #+*
-#+musl-cross-make.ac9b24d1802d03dfc89bdd862a2ea834cbc9b62bf6ef4e7d0615797decc2d778
-#+gnu-make.f0dc017413c19c171fb65e49e6000bcf8a5b1f6ca41c2de5f1ce75613dfc99d7
-#+busybox.cb0f7e8efa47c4d664466dca02b13dfc776aa20f910940e3db2c11fab573de21
+#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
+#+gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
+#+busybox.3fc94317bb59968e95887257dabbc7c67b57bd20b460bd9de37b24bd5e78b0b4
 #@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.08f954c641071a5d963fcc8682e665130ae8abd6db11fdc393eb8b9da2bb2b73
-make=/home/ccx/versions/gnu-make.f0dc017413c19c171fb65e49e6000bcf8a5b1f6ca41c2de5f1ce75613dfc99d7
+mcm=/home/ccx/versions/musl-cross-make.8918f75315c34347a99be45d064b5ebe1b01122797bce22d478003493c18f4fe
+make=/home/ccx/versions/gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
 
 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,4 +1,4 @@
-#+busybox.676a12450c8cf4d1a6bac35e656eec9732866a40ddc774ed9436e3947eabb4a7
-#+gnu-make.2e633e8bbb381ae47cb5211f49debc6559bf7d30159c00dc8ca865f1e0347cef
-#+musl-cross-make.ac9b24d1802d03dfc89bdd862a2ea834cbc9b62bf6ef4e7d0615797decc2d778
-#+execline.56f23d8ab7ba302b9b03cee65bdf55293462fde4063531bc9bac3eaa92d9be20-
\ No newline at end of file
+#+busybox.2d27d9247205c2e917d3d841dd623b99b0255e3d3ef3b637cf5690038a88597c
+#+gnu-make.91fb602bb1e2424540775e0f23515f021e3cae6ae9fc3b12d195bbd88f490eb9
+#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
+#+execline.94f934b455bb822465d00e96b5d26fdd48e0d266c14ef48605f4aa4912385719+
\ 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.ac9b24d1802d03dfc89bdd862a2ea834cbc9b62bf6ef4e7d0615797decc2d778
-#+gnu-make.2e633e8bbb381ae47cb5211f49debc6559bf7d30159c00dc8ca865f1e0347cef
-#+busybox.676a12450c8cf4d1a6bac35e656eec9732866a40ddc774ed9436e3947eabb4a7
-#+skalibs.5a056dca9253da7d83492d23ecfe7377655cb8a73cdc36860fa802e82a782413
+#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
+#+gnu-make.91fb602bb1e2424540775e0f23515f021e3cae6ae9fc3b12d195bbd88f490eb9
+#+busybox.2d27d9247205c2e917d3d841dd623b99b0255e3d3ef3b637cf5690038a88597c
+#+skalibs.eb3e14e55a16d9cd303dd91a08ed6365e24b78f94dfb1eca55cf2c6fd9a2393e
 #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
 
 : ${JOBS:=1}
@@ -23,9 +23,9 @@ cd execline
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5a056dca9253da7d83492d23ecfe7377655cb8a73cdc36860fa802e82a782413/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.eb3e14e55a16d9cd303dd91a08ed6365e24b78f94dfb1eca55cf2c6fd9a2393e/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
-	--with-lib='/home/ccx/versions/skalibs.5a056dca9253da7d83492d23ecfe7377655cb8a73cdc36860fa802e82a782413/library' \
+	--with-lib='/home/ccx/versions/skalibs.eb3e14e55a16d9cd303dd91a08ed6365e24b78f94dfb1eca55cf2c6fd9a2393e/library' \
 	--disable-shared --enable-static --enable-allstatic --enable-static-libc
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
@@ -54,7 +54,7 @@ $1!="."{exit 1}
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 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,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #+*
-#+musl-cross-make.ac9b24d1802d03dfc89bdd862a2ea834cbc9b62bf6ef4e7d0615797decc2d778
-#+gnu-make.f0dc017413c19c171fb65e49e6000bcf8a5b1f6ca41c2de5f1ce75613dfc99d7
-#+busybox.cb0f7e8efa47c4d664466dca02b13dfc776aa20f910940e3db2c11fab573de21
+#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
+#+gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
+#+busybox.3fc94317bb59968e95887257dabbc7c67b57bd20b460bd9de37b24bd5e78b0b4
 #@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 : ${JOBS:=1}
@@ -45,7 +45,7 @@ $1!="."{exit 1}
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 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
@@ -3,7 +3,7 @@
 #@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 : ${JOBS:=1}
-mcm=/home/ccx/versions/musl-cross-make.08f954c641071a5d963fcc8682e665130ae8abd6db11fdc393eb8b9da2bb2b73
+mcm=/home/ccx/versions/musl-cross-make.8918f75315c34347a99be45d064b5ebe1b01122797bce22d478003493c18f4fe
 
 export PATH="$mcm/bin:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
@@ -42,7 +42,7 @@ $1!="."{exit 1}
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 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.08f954c641071a5d963fcc8682e665130ae8abd6db11fdc393eb8b9da2bb2b73
-#+gnu-make.f0dc017413c19c171fb65e49e6000bcf8a5b1f6ca41c2de5f1ce75613dfc99d7
-#+busybox.cb0f7e8efa47c4d664466dca02b13dfc776aa20f910940e3db2c11fab573de21
+#+musl-cross-make.8918f75315c34347a99be45d064b5ebe1b01122797bce22d478003493c18f4fe
+#+gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
+#+busybox.3fc94317bb59968e95887257dabbc7c67b57bd20b460bd9de37b24bd5e78b0b4
 #@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
@@ -49,7 +49,7 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 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
@@ -42,7 +42,7 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 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.ac9b24d1802d03dfc89bdd862a2ea834cbc9b62bf6ef4e7d0615797decc2d778
-#+gnu-make.2e633e8bbb381ae47cb5211f49debc6559bf7d30159c00dc8ca865f1e0347cef
-#+busybox.676a12450c8cf4d1a6bac35e656eec9732866a40ddc774ed9436e3947eabb4a7
+#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
+#+gnu-make.91fb602bb1e2424540775e0f23515f021e3cae6ae9fc3b12d195bbd88f490eb9
+#+busybox.2d27d9247205c2e917d3d841dd623b99b0255e3d3ef3b637cf5690038a88597c
 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
 
 : ${JOBS:=1}
@@ -50,7 +50,7 @@ $1!="."{exit 1}
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
diff --git a/templates/genlinks b/templates/genlinks
@@ -28,7 +28,7 @@ $1!="."{exit 1}
 $2 == "share" && $3 ~ /^(info|man)$/ { link(r1($0)); next }
 $2 == "bin" { link(s1("command", $0)); next }
 $2 == "include" { link($0); next }
-$2 == "lib" { link($0); next }
+$2 ~ /^(lib|library|library\.so)/ { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }