commit 9910c3691472de13c75c562f8b8073c79c5a47c6 parent 9ff6eb66a24eae616f459ba1cbc9791493551668 Author: Jan Pobříslo <ccx@te2000.cz> Date: Tue, 20 Feb 2024 23:33:47 +0100 Fix absolute symlink in the mcm package Diffstat:
53 files changed, 299 insertions(+), 269 deletions(-)
diff --git a/packages/aat b/packages/aat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b -#+flex.5c320b46fa7d537c096fc4557bb01e6203fbe59935312034f793557e30a8dee5 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 +#+flex.ffef0bc6dfb5fbb917dbc057b8844d51aee2324e1f82d09f9126b3e835431f5d #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. autotools() { diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 -#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 -#+musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60- \ No newline at end of file +#+busybox.9219342c8a39a34cab116219216a353cbf372b495d705b6a0799924620079ee5 +#+gnu-make.082273a41956a0b3c848c7ffd8861d902bc4028ad247075699ccd3621a4711ce +#+musl-cross-make.fe71276a9f9182f3ad7578d9b04d0b05c5cd1e2ba353350810ad924a3aceeebc+ \ 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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 -#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.082273a41956a0b3c848c7ffd8861d902bc4028ad247075699ccd3621a4711ce +#+busybox.9219342c8a39a34cab116219216a353cbf372b495d705b6a0799924620079ee5 #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 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.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 -#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 +#+musl-cross-make.fe71276a9f9182f3ad7578d9b04d0b05c5cd1e2ba353350810ad924a3aceeebc +#+gnu-make.082273a41956a0b3c848c7ffd8861d902bc4028ad247075699ccd3621a4711ce #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} -mcm=/home/ccx/versions/musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 -make=/home/ccx/versions/gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 +mcm=/home/ccx/versions/musl-cross-make.fe71276a9f9182f3ad7578d9b04d0b05c5cd1e2ba353350810ad924a3aceeebc +make=/home/ccx/versions/gnu-make.082273a41956a0b3c848c7ffd8861d902bc4028ad247075699ccd3621a4711ce 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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} diff --git a/packages/containers b/packages/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+diffutils.4893712c93d3e870c3f69ce80975f398f5bbd6cfb835e2ae0b6ecb117331dfb7 -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+aat.ccfe4f5b065b462408cf10e961882d739d06e66729263765480eebec4a8d4f36 -#+fileset.8cab99a2ee720774b7ff550728c54827b5b50b66983e0c54c619649c5dfc7a07 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+diffutils.bf5564cc8f96f8cc069a0eae297a1db6b3a2ce8064327f297b0361dc1732fbdb +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+aat.f980df2f27cbf9e26f52da06278ba15a3ac56a96ee21574ca8b9e99d9ea314d4 +#+fileset.faf805bbeec71f1a2af54e89f4a43ed46feb280e34574b0ff4acfbe8f73a079f #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 -#+s6-rc.8184a09e45b50e8e7d072622608c4ab704e3cdf431ab60ac27e9b37f2e8b6132 -#+s6-portable-utils.b825fc44b3849bbd7aae4f05f866a5ac69d5caa3e99c291ed8cb9a9e5193ecfc -#+s6-linux-init.dbfd0a5cd062a6eeb4a238c215d569b436dc6bdb3be464618980bec0a0eeb9ab -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+core-system-rc.9f6c04036a5efa217e7364f54c37c92461bc38f95af94346081477b275db5df0 - -s6rcdb=/home/ccx/versions/core-system-rc.9f6c04036a5efa217e7364f54c37c92461bc38f95af94346081477b275db5df0/s6-rc-db +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+s6.837b5838a3cae0d5429746f5e17f0a32c43a74f4b9398818e0a4daeef9ede52b +#+s6-rc.5fd569863533de8b4973b0f773eca440a879e3cdd4199a76aa71783dc8908bb5 +#+s6-portable-utils.316ceeedf489ef3d811fa3f9cfdc07f912348175fe7684252efa12102b7e36d6 +#+s6-linux-init.3b1d2fc5476b751de3c194e52d4bef4d34b51e9195c34e6b95c56337d51ae828 +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+core-system-rc.27e224b80b6041b936da7ae72c5fc1f7eb202eacbd3539cd5f931306db9d0597 + +s6rcdb=/home/ccx/versions/core-system-rc.27e224b80b6041b936da7ae72c5fc1f7eb202eacbd3539cd5f931306db9d0597/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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+s6-rc.8184a09e45b50e8e7d072622608c4ab704e3cdf431ab60ac27e9b37f2e8b6132 -#+fileset.8cab99a2ee720774b7ff550728c54827b5b50b66983e0c54c619649c5dfc7a07 -#+core-system-conf.86763eb22a7d3bc279894f5f4c00f18ee2e4965b2ba01a382b0e09f84436aa54 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+s6-rc.5fd569863533de8b4973b0f773eca440a879e3cdd4199a76aa71783dc8908bb5 +#+fileset.faf805bbeec71f1a2af54e89f4a43ed46feb280e34574b0ff4acfbe8f73a079f +#+core-system-conf.f38637edb21c8264940b478f8b2016100767430ead3f1e7e2185cd4833e00b74 -conf=/home/ccx/versions/core-system-conf.86763eb22a7d3bc279894f5f4c00f18ee2e4965b2ba01a382b0e09f84436aa54/core-system-conf +conf=/home/ccx/versions/core-system-conf.f38637edb21c8264940b478f8b2016100767430ead3f1e7e2185cd4833e00b74/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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} diff --git a/packages/default.environment b/packages/default.environment @@ -1,30 +1,30 @@ -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+diffutils.4893712c93d3e870c3f69ce80975f398f5bbd6cfb835e2ae0b6ecb117331dfb7 -#+patch.37b4615e7aabb87d21334b2f88f4a7d748bab2c49ee04bdb14a47add5040932c -#+flex.5c320b46fa7d537c096fc4557bb01e6203fbe59935312034f793557e30a8dee5 -#+bison.4e6761e12a8ed5b711622d5016a892170eee37674123c01fb3d9962fea6347fd -#+rsync.8f9c022f5d9dce513115338a9af6803fd9b6523daf0370f51f51b90ce662e052 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 -#+s6-rc.8184a09e45b50e8e7d072622608c4ab704e3cdf431ab60ac27e9b37f2e8b6132 -#+s6-portable-utils.b825fc44b3849bbd7aae4f05f866a5ac69d5caa3e99c291ed8cb9a9e5193ecfc -#+s6-linux-utils.22688def1fbf2cbb7ee479dc0e1341bb8bc91c80147faa0c656ce520c318d859 -#+s6-linux-init.dbfd0a5cd062a6eeb4a238c215d569b436dc6bdb3be464618980bec0a0eeb9ab -#+mdevd.4497512176c1674e0f552102b9456802057adb955b8f7e8c09f1623df11257fa -#+s6-dns.5e1bf0d27be4ca2cdb85e71c6a5f5027b9ec7b2e212d70bb10ff7317a2c4073d -#+s6-networking.a264ada0bf3553a24510d8b9d177b4720592efbbbf0dcc66ac61f7b98f76ebb3 -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 -#+aat.ccfe4f5b065b462408cf10e961882d739d06e66729263765480eebec4a8d4f36 -#+confz.e2f4720676da080c36f58de8fba5612f4240dcc3fd04d5f66be469b2e5544537 -#+containers.c9b3e9312c6a6376a97571677fd54206f537b3be8d5da27a282b2efb1771a184 -#+fileset.8cab99a2ee720774b7ff550728c54827b5b50b66983e0c54c619649c5dfc7a07 -#+logincaps.1acb575874b3341fcb144e5bc0a2ac5bde6225f22b075d35059a56a6d85a4440 -#+snaprep.02bb31ad0f1e2215a0b8d5540ec1b26cb5ba7a01a7622658acbc2dd96465b470 -#+core-system-conf.86763eb22a7d3bc279894f5f4c00f18ee2e4965b2ba01a382b0e09f84436aa54 -#+core-system-rc.9f6c04036a5efa217e7364f54c37c92461bc38f95af94346081477b275db5df0 -#+core-system-scripts.9a7013d2182a3d8e132be5b3407d6ce6ab86fb6a67b5bb03f92d33489c3e01c8 -#+core-system-init.6ac361e8bd938b59138907e60cda971dd8db485b6d290ec88879f95bf70855a0 -#+linux.a9ef35524e30cf9d709e766565efc063b4c403e2051079203adc0276cd3817da- \ No newline at end of file +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+diffutils.bf5564cc8f96f8cc069a0eae297a1db6b3a2ce8064327f297b0361dc1732fbdb +#+patch.1ba99f477ffef65c516ea04bf56ec56f00897850034034419d48c5209ec30e57 +#+flex.ffef0bc6dfb5fbb917dbc057b8844d51aee2324e1f82d09f9126b3e835431f5d +#+bison.87ca869446c72df4b9b59e771bf2c5687ae9f65194392e00ed393fce2813b01b +#+rsync.9562503cd86909e7ea92e9494f92025730693f97c0d43fdac01b64b60ca0a670 +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+s6.837b5838a3cae0d5429746f5e17f0a32c43a74f4b9398818e0a4daeef9ede52b +#+s6-rc.5fd569863533de8b4973b0f773eca440a879e3cdd4199a76aa71783dc8908bb5 +#+s6-portable-utils.316ceeedf489ef3d811fa3f9cfdc07f912348175fe7684252efa12102b7e36d6 +#+s6-linux-utils.0279157c1061ead040022edbc5d7791cae5e380788064627f523d16127a7840c +#+s6-linux-init.3b1d2fc5476b751de3c194e52d4bef4d34b51e9195c34e6b95c56337d51ae828 +#+mdevd.a3ba00ca40dd2afb5e852ab374938860db210eb3a364af2ea0441884558b1cd4 +#+s6-dns.389f164df05560426642323a359676f0be2a53b58814fd4e4f364d5614c11107 +#+s6-networking.bcbcf772c504b0a2784c08ca002de8e538624cc4cd5a4cdb6d321cfeba74f52a +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d +#+aat.f980df2f27cbf9e26f52da06278ba15a3ac56a96ee21574ca8b9e99d9ea314d4 +#+confz.015b6a96bfc42e36159001def8aa6d2d157305c29e62863729275347bb6c0888 +#+containers.1c0cee7a0ebbbcd832976b60e750b3ae7e01c8b5abd170f537929b05f8646ce9 +#+fileset.faf805bbeec71f1a2af54e89f4a43ed46feb280e34574b0ff4acfbe8f73a079f +#+logincaps.d570972023c888ccda40a36a9b629b70f8e96f1b843de9363ef1d76b7d18db5f +#+snaprep.d8d116480340bedff28828a2f25e2141b61ff1765b6ec77e339592a206ed520f +#+core-system-conf.f38637edb21c8264940b478f8b2016100767430ead3f1e7e2185cd4833e00b74 +#+core-system-rc.27e224b80b6041b936da7ae72c5fc1f7eb202eacbd3539cd5f931306db9d0597 +#+core-system-scripts.85c180b70fbbfeda12ca48af7af89d7934b4af8d08adfa5ef7029a9388b63c50 +#+core-system-init.186b3ac3defba11894315c54d0b99fa4c80e1ee483e1e2d6b01b132fd0490df8 +#+linux.148f6fc39f8eb41d23410cd7743896ed83367aabb4dfdd2dafb4a70bad58e6f3+ \ 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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e/lib" +export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 -#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.082273a41956a0b3c848c7ffd8861d902bc4028ad247075699ccd3621a4711ce +#+busybox.9219342c8a39a34cab116219216a353cbf372b495d705b6a0799924620079ee5 #@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.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 +#+musl-cross-make.fe71276a9f9182f3ad7578d9b04d0b05c5cd1e2ba353350810ad924a3aceeebc #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { @@ -40,7 +40,7 @@ autotools() { -mcm=/home/ccx/versions/musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 +mcm=/home/ccx/versions/musl-cross-make.fe71276a9f9182f3ad7578d9b04d0b05c5cd1e2ba353350810ad924a3aceeebc 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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+diffutils.4893712c93d3e870c3f69ce80975f398f5bbd6cfb835e2ae0b6ecb117331dfb7 -#+patch.37b4615e7aabb87d21334b2f88f4a7d748bab2c49ee04bdb14a47add5040932c -#+flex.5c320b46fa7d537c096fc4557bb01e6203fbe59935312034f793557e30a8dee5 -#+bison.4e6761e12a8ed5b711622d5016a892170eee37674123c01fb3d9962fea6347fd -#+rsync.8f9c022f5d9dce513115338a9af6803fd9b6523daf0370f51f51b90ce662e052 -#+libelf-compat.240c51f37b1cc4fe762fc0fe3174e855ec8ad471341743984d1afa6b53e24d8f +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+diffutils.bf5564cc8f96f8cc069a0eae297a1db6b3a2ce8064327f297b0361dc1732fbdb +#+patch.1ba99f477ffef65c516ea04bf56ec56f00897850034034419d48c5209ec30e57 +#+flex.ffef0bc6dfb5fbb917dbc057b8844d51aee2324e1f82d09f9126b3e835431f5d +#+bison.87ca869446c72df4b9b59e771bf2c5687ae9f65194392e00ed393fce2813b01b +#+rsync.9562503cd86909e7ea92e9494f92025730693f97c0d43fdac01b64b60ca0a670 +#+libelf-compat.389425861cfd5bef0d5d21cbeadfd1cbcc5fb1f776d97bc5f1237a7b9cbdee30 #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b -#+gmp.60461567cc0ada0a16cb6590b25018801da8f985bcce2eafcbb05858b370d92b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 +#+gmp.4ea3e498135bd0f722e951d0e29cb5f89cfe01bb992fe7fcce4ccd45700dc92d #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 -#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 -#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 +#+musl-cross-make.fe71276a9f9182f3ad7578d9b04d0b05c5cd1e2ba353350810ad924a3aceeebc +#+gnu-make.082273a41956a0b3c848c7ffd8861d902bc4028ad247075699ccd3621a4711ce +#+busybox.9219342c8a39a34cab116219216a353cbf372b495d705b6a0799924620079ee5 #@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 @@ -38,6 +38,11 @@ find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld- make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make || exit $? make -C musl-cross-make install || exit $? +# Override linker symlink +for linkname in "${pthbs_destdir%/}"'/home/ccx/versions/'"$pthbs_package"'/lib/'ld-musl-*so*; do + ln -s -f libc.so "$linkname" +done + # Validate the compiler "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' -o true true.c diff --git a/packages/musl-cross-make:bootstrap-0 b/packages/musl-cross-make:bootstrap-0 @@ -31,6 +31,11 @@ sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-mu make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install +# Override linker symlink +for linkname in "${pthbs_destdir%/}"'/home/ccx/versions/'"$pthbs_package"'/lib/'ld-musl-*so*; do + ln -s -f libc.so "$linkname" +done + # Validate the compiler "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' -o true true.c 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.42b01c488ac6b72c2316c9f3210f345ced52f042d0c32b7bbc4c2c7c5985e1b0 +#+musl-cross-make.c8e01cecb353db9576f9ae28854a5b6a1bbb259147ef0d73e15d18621386eed2 #@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.42b01c488ac6b72c2316c9f3210f345ced52f042d0c32b7bbc4c2c7c5985e1b0 +bootstrap=/home/ccx/versions/musl-cross-make.c8e01cecb353db9576f9ae28854a5b6a1bbb259147ef0d73e15d18621386eed2 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -39,6 +39,11 @@ export PATH="$bootstrap/bin:$PATH" make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install +# Override linker symlink +for linkname in "${pthbs_destdir%/}"'/home/ccx/versions/'"$pthbs_package"'/lib/'ld-musl-*so*; do + ln -s -f libc.so "$linkname" +done + # Validate the compiler "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' -o true true.c diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 #@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.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b -#+popt.37cb826142fd3be836bd6d3ebceb5879fa323c8f3550bfdba30b716a22df7d41 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 +#+popt.d79902d4da9ad924813a5c998fbaca9034bd72aa095e0fa62f0c6ce8a5fd417f #@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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+patch.37b4615e7aabb87d21334b2f88f4a7d748bab2c49ee04bdb14a47add5040932c -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+patch.1ba99f477ffef65c516ea04bf56ec56f00897850034034419d48c5209ec30e57 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+s6.837b5838a3cae0d5429746f5e17f0a32c43a74f4b9398818e0a4daeef9ede52b #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 -#+s6-dns.5e1bf0d27be4ca2cdb85e71c6a5f5027b9ec7b2e212d70bb10ff7317a2c4073d +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+s6.837b5838a3cae0d5429746f5e17f0a32c43a74f4b9398818e0a4daeef9ede52b +#+s6-dns.389f164df05560426642323a359676f0be2a53b58814fd4e4f364d5614c11107 #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+s6.837b5838a3cae0d5429746f5e17f0a32c43a74f4b9398818e0a4daeef9ede52b #@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.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.e4c13a9b3c1c85017455b879c090e545c6203212963bcf769ac3176be90fb76c/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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} diff --git a/packages/snaprep b/packages/snaprep @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,29 +1,29 @@ -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+diffutils.4893712c93d3e870c3f69ce80975f398f5bbd6cfb835e2ae0b6ecb117331dfb7 -#+patch.37b4615e7aabb87d21334b2f88f4a7d748bab2c49ee04bdb14a47add5040932c -#+flex.5c320b46fa7d537c096fc4557bb01e6203fbe59935312034f793557e30a8dee5 -#+bison.4e6761e12a8ed5b711622d5016a892170eee37674123c01fb3d9962fea6347fd -#+rsync.8f9c022f5d9dce513115338a9af6803fd9b6523daf0370f51f51b90ce662e052 -#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 -#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 -#+s6-rc.8184a09e45b50e8e7d072622608c4ab704e3cdf431ab60ac27e9b37f2e8b6132 -#+s6-portable-utils.b825fc44b3849bbd7aae4f05f866a5ac69d5caa3e99c291ed8cb9a9e5193ecfc -#+s6-linux-utils.22688def1fbf2cbb7ee479dc0e1341bb8bc91c80147faa0c656ce520c318d859 -#+s6-linux-init.dbfd0a5cd062a6eeb4a238c215d569b436dc6bdb3be464618980bec0a0eeb9ab -#+mdevd.4497512176c1674e0f552102b9456802057adb955b8f7e8c09f1623df11257fa -#+s6-dns.5e1bf0d27be4ca2cdb85e71c6a5f5027b9ec7b2e212d70bb10ff7317a2c4073d -#+s6-networking.a264ada0bf3553a24510d8b9d177b4720592efbbbf0dcc66ac61f7b98f76ebb3 -#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa -#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 -#+aat.ccfe4f5b065b462408cf10e961882d739d06e66729263765480eebec4a8d4f36 -#+confz.e2f4720676da080c36f58de8fba5612f4240dcc3fd04d5f66be469b2e5544537 -#+containers.c9b3e9312c6a6376a97571677fd54206f537b3be8d5da27a282b2efb1771a184 -#+fileset.8cab99a2ee720774b7ff550728c54827b5b50b66983e0c54c619649c5dfc7a07 -#+logincaps.1acb575874b3341fcb144e5bc0a2ac5bde6225f22b075d35059a56a6d85a4440 -#+snaprep.02bb31ad0f1e2215a0b8d5540ec1b26cb5ba7a01a7622658acbc2dd96465b470 -#+core-system-conf.86763eb22a7d3bc279894f5f4c00f18ee2e4965b2ba01a382b0e09f84436aa54 -#+core-system-rc.9f6c04036a5efa217e7364f54c37c92461bc38f95af94346081477b275db5df0 -#+core-system-scripts.9a7013d2182a3d8e132be5b3407d6ce6ab86fb6a67b5bb03f92d33489c3e01c8 -#+core-system-init.6ac361e8bd938b59138907e60cda971dd8db485b6d290ec88879f95bf70855a0- \ No newline at end of file +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+diffutils.bf5564cc8f96f8cc069a0eae297a1db6b3a2ce8064327f297b0361dc1732fbdb +#+patch.1ba99f477ffef65c516ea04bf56ec56f00897850034034419d48c5209ec30e57 +#+flex.ffef0bc6dfb5fbb917dbc057b8844d51aee2324e1f82d09f9126b3e835431f5d +#+bison.87ca869446c72df4b9b59e771bf2c5687ae9f65194392e00ed393fce2813b01b +#+rsync.9562503cd86909e7ea92e9494f92025730693f97c0d43fdac01b64b60ca0a670 +#+execline.c38fc76cd52d12d00755dde694eb1a373878718517d8001fa34ab02ddce9579a +#+s6.837b5838a3cae0d5429746f5e17f0a32c43a74f4b9398818e0a4daeef9ede52b +#+s6-rc.5fd569863533de8b4973b0f773eca440a879e3cdd4199a76aa71783dc8908bb5 +#+s6-portable-utils.316ceeedf489ef3d811fa3f9cfdc07f912348175fe7684252efa12102b7e36d6 +#+s6-linux-utils.0279157c1061ead040022edbc5d7791cae5e380788064627f523d16127a7840c +#+s6-linux-init.3b1d2fc5476b751de3c194e52d4bef4d34b51e9195c34e6b95c56337d51ae828 +#+mdevd.a3ba00ca40dd2afb5e852ab374938860db210eb3a364af2ea0441884558b1cd4 +#+s6-dns.389f164df05560426642323a359676f0be2a53b58814fd4e4f364d5614c11107 +#+s6-networking.bcbcf772c504b0a2784c08ca002de8e538624cc4cd5a4cdb6d321cfeba74f52a +#+zsh.ab08987bbea4c431c0118180134b6ef1a8d8d76ae70aeff320eaf05bb1a041e0 +#+pthbs-banginstall.da229dee9c6b5fc614e04c05b5f5f8e471356b0744732f07c93ee9c02d3be08d +#+aat.f980df2f27cbf9e26f52da06278ba15a3ac56a96ee21574ca8b9e99d9ea314d4 +#+confz.015b6a96bfc42e36159001def8aa6d2d157305c29e62863729275347bb6c0888 +#+containers.1c0cee7a0ebbbcd832976b60e750b3ae7e01c8b5abd170f537929b05f8646ce9 +#+fileset.faf805bbeec71f1a2af54e89f4a43ed46feb280e34574b0ff4acfbe8f73a079f +#+logincaps.d570972023c888ccda40a36a9b629b70f8e96f1b843de9363ef1d76b7d18db5f +#+snaprep.d8d116480340bedff28828a2f25e2141b61ff1765b6ec77e339592a206ed520f +#+core-system-conf.f38637edb21c8264940b478f8b2016100767430ead3f1e7e2185cd4833e00b74 +#+core-system-rc.27e224b80b6041b936da7ae72c5fc1f7eb202eacbd3539cd5f931306db9d0597 +#+core-system-scripts.85c180b70fbbfeda12ca48af7af89d7934b4af8d08adfa5ef7029a9388b63c50 +#+core-system-init.186b3ac3defba11894315c54d0b99fa4c80e1ee483e1e2d6b01b132fd0490df8+ \ 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.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e -#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f -#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf -#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 -#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b -#+netbsd-curses.6235a2619be8f724901a71e3950739c2db7d4207647178ad0b245044bf905dcc +#+musl-cross-make.21de3da2d176772e2d7d0671e5c4fda609a63f2cfc407c7465f7cd2392f0c4d4 +#+gnu-make.a4a0894deb77aa09e397dbc5e6fef77ec663767aa7bd2e1f8451fb98e7de726b +#+busybox.ea3772ab4627a28515687db1db68c45d56cca584f187714cdaba054149a3bea4 +#+busybox-diffutils.609a553a89565e8b693a93acbbb037d3d76468dc1ea8e79b0d5169e422a2684c +#+m4.4e3ed8aba97841a310e28f01fdb5b0dff8c30d78bf36cb3d32edbdbbc76a5fd4 +#+netbsd-curses.06233b6b6b2e212e03a5ebd63585c5bf0a9920cdd8134ddc1817ef68264676a0 #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -39,6 +39,11 @@ find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld- {{make}} -C musl-cross-make || exit $? make -C musl-cross-make install || exit $? +# Override linker symlink +for linkname in "${pthbs_destdir%/}"'{{versions}}/'"$pthbs_package"'/lib/'ld-musl-*so*; do + ln -s -f libc.so "$linkname" +done + # Validate the compiler "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c diff --git a/templates/pkg/musl-cross-make:bootstrap-0 b/templates/pkg/musl-cross-make:bootstrap-0 @@ -32,6 +32,11 @@ sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-mu {{make}} -C musl-cross-make make -C musl-cross-make install +# Override linker symlink +for linkname in "${pthbs_destdir%/}"'{{versions}}/'"$pthbs_package"'/lib/'ld-musl-*so*; do + ln -s -f libc.so "$linkname" +done + # Validate the compiler "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1 @@ -40,6 +40,11 @@ export PATH="$bootstrap/bin:$PATH" {{make}} -C musl-cross-make make -C musl-cross-make install +# Override linker symlink +for linkname in "${pthbs_destdir%/}"'{{versions}}/'"$pthbs_package"'/lib/'ld-musl-*so*; do + ln -s -f libc.so "$linkname" +done + # Validate the compiler "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c