pthbs

commit a20ab3e24c66d7c6be2258569ef228eab68daf8d
parent b0bd025a5ff869e846a351adb68799f221861259
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Wed, 14 Jun 2023 00:34:23 +0200

Break down genlinks rules into separate statements

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

10 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/packages/busybox b/packages/busybox
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #+*
-#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
-#+gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
-#+busybox.3fc94317bb59968e95887257dabbc7c67b57bd20b460bd9de37b24bd5e78b0b4
+#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
+#+gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
+#+busybox.9eea98edadaac634b82079a4493c29eaa21700f840d76336466340c7ff534aed
 #@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.8918f75315c34347a99be45d064b5ebe1b01122797bce22d478003493c18f4fe
-make=/home/ccx/versions/gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
+mcm=/home/ccx/versions/musl-cross-make.aaaff5e3281705bd84754e3e7af8829ba6350b8a520b455d310a3a5f32cdf120
+make=/home/ccx/versions/gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
 
 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.2d27d9247205c2e917d3d841dd623b99b0255e3d3ef3b637cf5690038a88597c
-#+gnu-make.91fb602bb1e2424540775e0f23515f021e3cae6ae9fc3b12d195bbd88f490eb9
-#+musl-cross-make.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
-#+execline.94f934b455bb822465d00e96b5d26fdd48e0d266c14ef48605f4aa4912385719-
\ No newline at end of file
+#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
+#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
+#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
+#+execline.e8cdfebc01299a8edf599c44bcce9772a867ac9c47403a7d6d17c54fd6a937bc+
\ 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.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
-#+gnu-make.91fb602bb1e2424540775e0f23515f021e3cae6ae9fc3b12d195bbd88f490eb9
-#+busybox.2d27d9247205c2e917d3d841dd623b99b0255e3d3ef3b637cf5690038a88597c
-#+skalibs.eb3e14e55a16d9cd303dd91a08ed6365e24b78f94dfb1eca55cf2c6fd9a2393e
+#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
+#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
+#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
+#+skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab
 #@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.eb3e14e55a16d9cd303dd91a08ed6365e24b78f94dfb1eca55cf2c6fd9a2393e/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
-	--with-lib='/home/ccx/versions/skalibs.eb3e14e55a16d9cd303dd91a08ed6365e24b78f94dfb1eca55cf2c6fd9a2393e/library' \
+	--with-lib='/home/ccx/versions/skalibs.45af710fd510dbca710416233602d6e38c7a07378270a33c909682d48ca297ab/library' \
 	--disable-shared --enable-static --enable-allstatic --enable-static-libc
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
@@ -54,7 +54,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { 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.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
-#+gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
-#+busybox.3fc94317bb59968e95887257dabbc7c67b57bd20b460bd9de37b24bd5e78b0b4
+#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
+#+gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
+#+busybox.9eea98edadaac634b82079a4493c29eaa21700f840d76336466340c7ff534aed
 #@untar:-vz:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 : ${JOBS:=1}
@@ -45,7 +45,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { 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.8918f75315c34347a99be45d064b5ebe1b01122797bce22d478003493c18f4fe
+mcm=/home/ccx/versions/musl-cross-make.aaaff5e3281705bd84754e3e7af8829ba6350b8a520b455d310a3a5f32cdf120
 
 export PATH="$mcm/bin:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
@@ -42,7 +42,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { 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.8918f75315c34347a99be45d064b5ebe1b01122797bce22d478003493c18f4fe
-#+gnu-make.681e56947046b0a62e4055670d8a26f37a75bafbef2601dc7976515120ffa788
-#+busybox.3fc94317bb59968e95887257dabbc7c67b57bd20b460bd9de37b24bd5e78b0b4
+#+musl-cross-make.aaaff5e3281705bd84754e3e7af8829ba6350b8a520b455d310a3a5f32cdf120
+#+gnu-make.56944e588080402d2e22a04c6d9b8994ba52910f0afc41e8b6068b903cb8de19
+#+busybox.9eea98edadaac634b82079a4493c29eaa21700f840d76336466340c7ff534aed
 #@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,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { 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,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { 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.13fb687db02f912331aca6cd328d058cb70b41ce7472362c3349b636ffa6f58c
-#+gnu-make.91fb602bb1e2424540775e0f23515f021e3cae6ae9fc3b12d195bbd88f490eb9
-#+busybox.2d27d9247205c2e917d3d841dd623b99b0255e3d3ef3b637cf5690038a88597c
+#+musl-cross-make.174caae2eabc9cd58859ace659c02352f121b4021e96cf6381632129988e39ec
+#+gnu-make.1591841d61749dff544266ed7ceaf40631698486319b221a0dbb1bd0b2297ac9
+#+busybox.db62e4a9ea0f78c45e803fb9350b99b1b860457bb4b165ed18f11fb198375458
 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
 
 : ${JOBS:=1}
@@ -50,7 +50,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { 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,9 @@ $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|library|library\.so)/ { link($0); next }
+$2 == "library.so" { link($0); next }
+$2 == "lib" { link(s1("library.so", $0)); next }
+$2 == "library" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }