commit 5dd944fcb1e352777c8654cbcee3ec7b6c1d84cf parent 682025f9c6a52d798928050274627ddfff755d3c Author: Jan Pobříslo <ccx@te2000.cz> Date: Tue, 20 Feb 2024 21:58:58 +0100 Fix sed to actually change linker path Diffstat:
53 files changed, 275 insertions(+), 275 deletions(-)
diff --git a/packages/aat b/packages/aat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat : ${JOBS:=1} diff --git a/packages/bison b/packages/bison @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd -#+flex.de23d389e9c49babee1518132539e41cc9bf773238edcea8eb6ba09465ebc279 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. autotools() { diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 -#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 -#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163- \ No newline at end of file +#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 +#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 +#+musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943+ \ No newline at end of file diff --git a/packages/busybox b/packages/busybox @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 -#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 +#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/packages/busybox-diffutils b/packages/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/packages/busybox-login b/packages/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 -#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 +#+musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 +#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} -mcm=/home/ccx/versions/musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 -make=/home/ccx/versions/gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 +mcm=/home/ccx/versions/musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 +make=/home/ccx/versions/gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/packages/confz b/packages/confz @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} diff --git a/packages/containers b/packages/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b #@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers : ${JOBS:=1} diff --git a/packages/core-system-conf b/packages/core-system-conf @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+diffutils.ec12c9a0ba8cf01565a5909a5c5e03711494851c611d022897386e818db2d9a7 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+aat.a87a6bce7b308021a6cdd7345b09d45ba61bd6b4806054d6b0c14845891a9cfb -#+fileset.ddcda2c4d8308baf48e8724c4e855a76d4eae53b65b60c7b69716aeb03db986e +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+aat.f59b4ac18cf6e5bb34670b26d64d5849bf1f764fc05c8d63bd1313394de6072b +#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f #@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf : ${JOBS:=1} diff --git a/packages/core-system-init b/packages/core-system-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 -#+s6-rc.a375d7e981fd0348c330a1295b333363ba8c2dd772f0d9dfd74d670fe0e89d0a -#+s6-portable-utils.ba00991e8e1c307c80564504a5242fdace053089601f209b862ce22e832b6e40 -#+s6-linux-init.67caae976ff939e3e2754cccce502afa0c23381976277ce848d1933b953738b0 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+core-system-rc.3403fbf94c8a514eba0d34b622e9f2cdcb258cd1324629568aebd7ea9d832eba - -s6rcdb=/home/ccx/versions/core-system-rc.3403fbf94c8a514eba0d34b622e9f2cdcb258cd1324629568aebd7ea9d832eba/s6-rc-db +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f +#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e +#+s6-portable-utils.799b134eec090dd92283a59796ac8972e5bf301c3cb972bffd097db6e6e403a9 +#+s6-linux-init.fa9f0519d9550645318b1bb904d6fe27cb158a0009b0c2555b659f373744343d +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c + +s6rcdb=/home/ccx/versions/core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c/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 @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+s6-rc.a375d7e981fd0348c330a1295b333363ba8c2dd772f0d9dfd74d670fe0e89d0a -#+fileset.ddcda2c4d8308baf48e8724c4e855a76d4eae53b65b60c7b69716aeb03db986e -#+core-system-conf.9ee0a2606fc6aa0b9eeebeba1e76caa69688ad8392f5d3de40e48078fac5897e +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e +#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f +#+core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c -conf=/home/ccx/versions/core-system-conf.9ee0a2606fc6aa0b9eeebeba1e76caa69688ad8392f5d3de40e48078fac5897e/core-system-conf +conf=/home/ccx/versions/core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c/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.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} diff --git a/packages/default.environment b/packages/default.environment @@ -1,30 +1,30 @@ -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+diffutils.ec12c9a0ba8cf01565a5909a5c5e03711494851c611d022897386e818db2d9a7 -#+patch.011ef5d8d3de3953e02cec649dc4f3774ac95cc2b20a5e8e67591ef8a9c091cf -#+flex.de23d389e9c49babee1518132539e41cc9bf773238edcea8eb6ba09465ebc279 -#+bison.2f24ecc2c2547d88d237ebc57cb86ec50de0e9b66b4d135572ccfcf9ac8e339b -#+rsync.18830ac505c332ddb752f370f0dc4199a29d606862f8a443044a85531462781a -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 -#+s6-rc.a375d7e981fd0348c330a1295b333363ba8c2dd772f0d9dfd74d670fe0e89d0a -#+s6-portable-utils.ba00991e8e1c307c80564504a5242fdace053089601f209b862ce22e832b6e40 -#+s6-linux-utils.cea18973499865a7a7626eea5f11c618b452c0ff2484ed9c2bf811eb2e0b7f44 -#+s6-linux-init.67caae976ff939e3e2754cccce502afa0c23381976277ce848d1933b953738b0 -#+mdevd.e104c7d387244e43041036f09333186f303a1b83a50acf2ecf71fb82791125dc -#+s6-dns.f2264e9ce842a15d4af786dd25bea8811eb618600e993e96e51e8d1bd7b0795c -#+s6-networking.c6b622118162029f173d410c877e0dbd2b66bb0941f5b71ad844588d5d49093d -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 -#+aat.a87a6bce7b308021a6cdd7345b09d45ba61bd6b4806054d6b0c14845891a9cfb -#+confz.08414d7369a6730c4cabe700b5185b135bb2c3099457be8785024400f9e61d02 -#+containers.97fa64322d9ccbc41ecfba0c7193dc855a5bf84b026579f3fa5687bfbdbffeae -#+fileset.ddcda2c4d8308baf48e8724c4e855a76d4eae53b65b60c7b69716aeb03db986e -#+logincaps.5995001371ec61ddc16b3e9124a86890cd9d6f6a49a511663d71860eb1afb4f3 -#+snaprep.dca0ec4c1ba38ed2cd44c9ac402d16bfdaf91d4736b3ad00a00ae8344f04a6f0 -#+core-system-conf.9ee0a2606fc6aa0b9eeebeba1e76caa69688ad8392f5d3de40e48078fac5897e -#+core-system-rc.3403fbf94c8a514eba0d34b622e9f2cdcb258cd1324629568aebd7ea9d832eba -#+core-system-scripts.3b40a31cdb762d4b1269a16cefec0f5f553c3d27564e5fc7689653e7ede22450 -#+core-system-init.5c78188f55ed17682948d36bbbfdf620090ce5479779449184364658016be4df -#+linux.cb3208ce982af892cdbf64551832a35d59a9cc46e9cede3561c4ba2008095b1e- \ No newline at end of file +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 +#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a +#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 +#+bison.63d0b360b3b7e830d2ae8bac332f578217178551cc7d96ef0fe5489fc83b8ecd +#+rsync.c749a3ea3808d2d88a6bf1bbf1e6cb1f97f4ef9c5148c1a218bd8b415621ac1a +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f +#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e +#+s6-portable-utils.799b134eec090dd92283a59796ac8972e5bf301c3cb972bffd097db6e6e403a9 +#+s6-linux-utils.9b3c053ca45a2713bf97bd0ddebbe5a9daa8feff99eac7b5a33c3d084945e85d +#+s6-linux-init.fa9f0519d9550645318b1bb904d6fe27cb158a0009b0c2555b659f373744343d +#+mdevd.e7c10fce5e27b01a74e389e32993fe57e5068fb725896a1a2abca01f4d8027eb +#+s6-dns.9156a25c395337313b4297a49537e982d0941366a12e571e62ee5cec4240c78d +#+s6-networking.16cf49361c09f26e8837ff8b60752de3d3aa296f1688f22902a36b4fec56502b +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+aat.f59b4ac18cf6e5bb34670b26d64d5849bf1f764fc05c8d63bd1313394de6072b +#+confz.3b4a9818cb779bd41506ca0da3443a895e9ad8c9447dce05d81fd3231d17eaa0 +#+containers.daa87e5837d077c04985d52124c55acd91c6ca8935c855adb23e6696ead7cfcf +#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f +#+logincaps.197e175f2c8203cdd9f62f28f0fb9c81a54cddb674ee5da63037901c8d86198a +#+snaprep.55df59a8767e7713966279a334bdda285f2b92e54974423bda875a69b6f6ae1e +#+core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c +#+core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c +#+core-system-scripts.ea9e3496477cdfc681d399f2e3191357082ad6833651f97328be2a2c1eef8090 +#+core-system-init.f23b8c0afd2324d04e2440fb4b78261719e2fd08e871a0fbfa9081f3ac79695f +#+linux.2aa12ea1c0883fe8c535f961b518f72ed1423161b9497f6a5e5bfded36d505a2+ \ No newline at end of file diff --git a/packages/diffutils b/packages/diffutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. autotools() { diff --git a/packages/elf.h b/packages/elf.h @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 #@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" diff --git a/packages/elfutils b/packages/elfutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:. autotools() { @@ -42,7 +42,7 @@ autotools() { export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference" -export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967/lib" +export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0/lib" autotools elfutils-0.189 \ --disable-nls \ diff --git a/packages/execline b/packages/execline @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline : ${JOBS:=1} @@ -16,7 +16,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/fileset b/packages/fileset @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 #@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset : ${JOBS:=1} diff --git a/packages/flex b/packages/flex @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. autotools() { diff --git a/packages/gmp b/packages/gmp @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-j:sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:. autotools() { diff --git a/packages/gnu-make b/packages/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 -#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 +#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 +#+musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { @@ -40,7 +40,7 @@ autotools() { -mcm=/home/ccx/versions/musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 +mcm=/home/ccx/versions/musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/packages/libelf-compat b/packages/libelf-compat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch #@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:. diff --git a/packages/libelf.h b/packages/libelf.h @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 #@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h #@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h #@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h diff --git a/packages/linux b/packages/linux @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+diffutils.ec12c9a0ba8cf01565a5909a5c5e03711494851c611d022897386e818db2d9a7 -#+patch.011ef5d8d3de3953e02cec649dc4f3774ac95cc2b20a5e8e67591ef8a9c091cf -#+flex.de23d389e9c49babee1518132539e41cc9bf773238edcea8eb6ba09465ebc279 -#+bison.2f24ecc2c2547d88d237ebc57cb86ec50de0e9b66b4d135572ccfcf9ac8e339b -#+rsync.18830ac505c332ddb752f370f0dc4199a29d606862f8a443044a85531462781a -#+libelf-compat.ba0f97c03e7688ba05d2e8e08f238ae041ab7572269a274a1e619d73afe16443 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 +#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a +#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 +#+bison.63d0b360b3b7e830d2ae8bac332f578217178551cc7d96ef0fe5489fc83b8ecd +#+rsync.c749a3ea3808d2d88a6bf1bbf1e6cb1f97f4ef9c5148c1a218bd8b415621ac1a +#+libelf-compat.0be0047db143a5871b4de4943533fdd2e3d3f3468d8828dd0b4ce8311953ebda #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config diff --git a/packages/logincaps b/packages/logincaps @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps : ${JOBS:=1} diff --git a/packages/m4 b/packages/m4 @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. autotools() { diff --git a/packages/mdevd b/packages/mdevd @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b #@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd : ${JOBS:=1} @@ -17,7 +17,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/mpc b/packages/mpc @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd -#+gmp.d0b33598246b5357db03915a67e7ac280c5c427ea78423d3c3ce0d2fc1362e79 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+gmp.ec42f91cab2a8c214ff30955fbdb70b3cbcda02bc812e495f53734540da06b8b #@untar:-z:sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:. autotools() { diff --git a/packages/mpfr b/packages/mpfr @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-z:sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:. autotools() { diff --git a/packages/musl-cross-make b/packages/musl-cross-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 -#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 -#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 +#+musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 +#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 +#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 #@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 @@ -30,7 +30,7 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; +find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make || exit $? make -C musl-cross-make install || exit $? diff --git a/packages/musl-cross-make:bootstrap-0 b/packages/musl-cross-make:bootstrap-0 @@ -19,7 +19,7 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; +find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install diff --git a/packages/musl-cross-make:bootstrap-1 b/packages/musl-cross-make:bootstrap-1 @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.37eeac552d7459ba9108d00708ca313a91b503a0531f62963cfb68c79f45272d +#+musl-cross-make.78855e2f8857b2bcc7d7e1c65fef969d5e020177f97c9cb2dec38fc2edec82b3 #@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 @@ -13,7 +13,7 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} -bootstrap=/home/ccx/versions/musl-cross-make.37eeac552d7459ba9108d00708ca313a91b503a0531f62963cfb68c79f45272d +bootstrap=/home/ccx/versions/musl-cross-make.78855e2f8857b2bcc7d7e1c65fef969d5e020177f97c9cb2dec38fc2edec82b3 "$bootstrap/bin/x86_64-linux-musl-gcc" --version printf '%s\n' >musl-cross-make/config.mak \ @@ -27,7 +27,7 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CC="${bbin}/x86_64-linux-musl-gcc ${st}" CXX="${bbin}/x86_64-linux-musl-g++ ${st}"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; +find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; export PATH="$bootstrap/bin:$PATH" make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 #@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" diff --git a/packages/patch b/packages/patch @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. autotools() { diff --git a/packages/popt b/packages/popt @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. autotools() { diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" diff --git a/packages/rsync b/packages/rsync @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd -#+popt.49bcaf410f20f0dfe824aa211baaeed76d2e7323c3f9f4a6de6e854f93fbfa87 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+popt.2bd1ba55f9bddfb990a37f57666f13b206f5e83b4445cd528dcfa4a81380d508 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. autotools() { diff --git a/packages/s6 b/packages/s6 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+patch.011ef5d8d3de3953e02cec649dc4f3774ac95cc2b20a5e8e67591ef8a9c091cf -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b #@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.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-dns b/packages/s6-dns @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 #@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns : ${JOBS:=1} @@ -16,7 +16,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-linux-init b/packages/s6-linux-init @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f #@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init : ${JOBS:=1} @@ -18,7 +18,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 #@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils : ${JOBS:=1} @@ -16,7 +16,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-networking b/packages/s6-networking @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 -#+s6-dns.f2264e9ce842a15d4af786dd25bea8811eb618600e993e96e51e8d1bd7b0795c +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f +#+s6-dns.9156a25c395337313b4297a49537e982d0941366a12e571e62ee5cec4240c78d #@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking : ${JOBS:=1} @@ -19,7 +19,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 #@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils : ${JOBS:=1} @@ -16,7 +16,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-rc b/packages/s6-rc @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f #@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc : ${JOBS:=1} @@ -18,7 +18,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/skalibs b/packages/skalibs @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} diff --git a/packages/snaprep b/packages/snaprep @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,29 +1,29 @@ -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+diffutils.ec12c9a0ba8cf01565a5909a5c5e03711494851c611d022897386e818db2d9a7 -#+patch.011ef5d8d3de3953e02cec649dc4f3774ac95cc2b20a5e8e67591ef8a9c091cf -#+flex.de23d389e9c49babee1518132539e41cc9bf773238edcea8eb6ba09465ebc279 -#+bison.2f24ecc2c2547d88d237ebc57cb86ec50de0e9b66b4d135572ccfcf9ac8e339b -#+rsync.18830ac505c332ddb752f370f0dc4199a29d606862f8a443044a85531462781a -#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d -#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 -#+s6-rc.a375d7e981fd0348c330a1295b333363ba8c2dd772f0d9dfd74d670fe0e89d0a -#+s6-portable-utils.ba00991e8e1c307c80564504a5242fdace053089601f209b862ce22e832b6e40 -#+s6-linux-utils.cea18973499865a7a7626eea5f11c618b452c0ff2484ed9c2bf811eb2e0b7f44 -#+s6-linux-init.67caae976ff939e3e2754cccce502afa0c23381976277ce848d1933b953738b0 -#+mdevd.e104c7d387244e43041036f09333186f303a1b83a50acf2ecf71fb82791125dc -#+s6-dns.f2264e9ce842a15d4af786dd25bea8811eb618600e993e96e51e8d1bd7b0795c -#+s6-networking.c6b622118162029f173d410c877e0dbd2b66bb0941f5b71ad844588d5d49093d -#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 -#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 -#+aat.a87a6bce7b308021a6cdd7345b09d45ba61bd6b4806054d6b0c14845891a9cfb -#+confz.08414d7369a6730c4cabe700b5185b135bb2c3099457be8785024400f9e61d02 -#+containers.97fa64322d9ccbc41ecfba0c7193dc855a5bf84b026579f3fa5687bfbdbffeae -#+fileset.ddcda2c4d8308baf48e8724c4e855a76d4eae53b65b60c7b69716aeb03db986e -#+logincaps.5995001371ec61ddc16b3e9124a86890cd9d6f6a49a511663d71860eb1afb4f3 -#+snaprep.dca0ec4c1ba38ed2cd44c9ac402d16bfdaf91d4736b3ad00a00ae8344f04a6f0 -#+core-system-conf.9ee0a2606fc6aa0b9eeebeba1e76caa69688ad8392f5d3de40e48078fac5897e -#+core-system-rc.3403fbf94c8a514eba0d34b622e9f2cdcb258cd1324629568aebd7ea9d832eba -#+core-system-scripts.3b40a31cdb762d4b1269a16cefec0f5f553c3d27564e5fc7689653e7ede22450 -#+core-system-init.5c78188f55ed17682948d36bbbfdf620090ce5479779449184364658016be4df- \ No newline at end of file +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 +#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a +#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 +#+bison.63d0b360b3b7e830d2ae8bac332f578217178551cc7d96ef0fe5489fc83b8ecd +#+rsync.c749a3ea3808d2d88a6bf1bbf1e6cb1f97f4ef9c5148c1a218bd8b415621ac1a +#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f +#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e +#+s6-portable-utils.799b134eec090dd92283a59796ac8972e5bf301c3cb972bffd097db6e6e403a9 +#+s6-linux-utils.9b3c053ca45a2713bf97bd0ddebbe5a9daa8feff99eac7b5a33c3d084945e85d +#+s6-linux-init.fa9f0519d9550645318b1bb904d6fe27cb158a0009b0c2555b659f373744343d +#+mdevd.e7c10fce5e27b01a74e389e32993fe57e5068fb725896a1a2abca01f4d8027eb +#+s6-dns.9156a25c395337313b4297a49537e982d0941366a12e571e62ee5cec4240c78d +#+s6-networking.16cf49361c09f26e8837ff8b60752de3d3aa296f1688f22902a36b4fec56502b +#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+aat.f59b4ac18cf6e5bb34670b26d64d5849bf1f764fc05c8d63bd1313394de6072b +#+confz.3b4a9818cb779bd41506ca0da3443a895e9ad8c9447dce05d81fd3231d17eaa0 +#+containers.daa87e5837d077c04985d52124c55acd91c6ca8935c855adb23e6696ead7cfcf +#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f +#+logincaps.197e175f2c8203cdd9f62f28f0fb9c81a54cddb674ee5da63037901c8d86198a +#+snaprep.55df59a8767e7713966279a334bdda285f2b92e54974423bda875a69b6f6ae1e +#+core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c +#+core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c +#+core-system-scripts.ea9e3496477cdfc681d399f2e3191357082ad6833651f97328be2a2c1eef8090 +#+core-system-init.f23b8c0afd2324d04e2440fb4b78261719e2fd08e871a0fbfa9081f3ac79695f+ \ No newline at end of file diff --git a/packages/zsh b/packages/zsh @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 -#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 -#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a -#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 -#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd -#+netbsd-curses.68b6ade4a859deab9d5b4f1f7d8be7c749dc97b3d13a71d5022161cf4e9be74d +#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee +#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+netbsd-curses.13cb5c3606b719f78f384b4c38b9a61cb9a3f1de5eb4d787ef294ccdff710e4b #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -31,7 +31,7 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; +find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; {{make}} -C musl-cross-make || exit $? make -C musl-cross-make install || exit $? diff --git a/templates/pkg/musl-cross-make:bootstrap-0 b/templates/pkg/musl-cross-make:bootstrap-0 @@ -20,7 +20,7 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; +find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; {{make}} -C musl-cross-make make -C musl-cross-make install diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1 @@ -28,7 +28,7 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CC="${bbin}/{{triplet}}-gcc ${st}" CXX="${bbin}/{{triplet}}-g++ ${st}"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; +find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; export PATH="$bootstrap/bin:$PATH" {{make}} -C musl-cross-make