commit 682025f9c6a52d798928050274627ddfff755d3c parent b55c861fe08fd49afddb3031c3e704ccc9ecf2ea Author: Jan Pobříslo <ccx@te2000.cz> Date: Tue, 20 Feb 2024 21:33:25 +0100 Patch musl-cross-make to use package-specific interpreter library Diffstat:
53 files changed, 295 insertions(+), 279 deletions(-)
diff --git a/packages/aat b/packages/aat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 -#+flex.c462af2bf7558e744a4a40f0c344b872b13a128f13fe07ff9101af794bc31fd8 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+flex.de23d389e9c49babee1518132539e41cc9bf773238edcea8eb6ba09465ebc279 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. autotools() { diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 -#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 -#+musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018- \ No newline at end of file +#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 +#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 +#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163+ \ 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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 -#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 +#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a 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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a 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.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 -#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 +#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 +#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} -mcm=/home/ccx/versions/musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 -make=/home/ccx/versions/gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 +mcm=/home/ccx/versions/musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 +make=/home/ccx/versions/gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} diff --git a/packages/containers b/packages/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+diffutils.0c0a86c684fdbea1fefd4daa512ca40fb323826b030f6067e72292f8cd1dfb63 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+aat.dd7188abfd64057191f506097019eb56bf04ba60eacc3f85eac62200d1dc6534 -#+fileset.0721183e5f2c95de8f91e4cb919c6b7261302b875dad20c737fa49f7dd19bef0 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+diffutils.ec12c9a0ba8cf01565a5909a5c5e03711494851c611d022897386e818db2d9a7 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+aat.a87a6bce7b308021a6cdd7345b09d45ba61bd6b4806054d6b0c14845891a9cfb +#+fileset.ddcda2c4d8308baf48e8724c4e855a76d4eae53b65b60c7b69716aeb03db986e #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+s6.d8e122545ddfe10c791a8222e5abd3531713120037c2c78284e6a2ecbe985e4f -#+s6-rc.a5118483e35fbef8cfa98e21c2462685f0f55c7711738db7d79a42b370453ccb -#+s6-portable-utils.d405fc0a6e72970beed0d4f49e58b63aaa20f1efc57aa901fe362277e4a0425b -#+s6-linux-init.bceeb8c67c962f5c58fae586db1e43bc4851de177691da074362ae45262d8157 -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+core-system-rc.9c307525685adbc8b3840a00956aeffa421ede1bfb67cef94de7a7d945a49f9f - -s6rcdb=/home/ccx/versions/core-system-rc.9c307525685adbc8b3840a00956aeffa421ede1bfb67cef94de7a7d945a49f9f/s6-rc-db +#+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 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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+s6-rc.a5118483e35fbef8cfa98e21c2462685f0f55c7711738db7d79a42b370453ccb -#+fileset.0721183e5f2c95de8f91e4cb919c6b7261302b875dad20c737fa49f7dd19bef0 -#+core-system-conf.df1bc443073bd543cb2cd6e2693474d9d209e479947bd51ff457b3277b3d95d5 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+s6-rc.a375d7e981fd0348c330a1295b333363ba8c2dd772f0d9dfd74d670fe0e89d0a +#+fileset.ddcda2c4d8308baf48e8724c4e855a76d4eae53b65b60c7b69716aeb03db986e +#+core-system-conf.9ee0a2606fc6aa0b9eeebeba1e76caa69688ad8392f5d3de40e48078fac5897e -conf=/home/ccx/versions/core-system-conf.df1bc443073bd543cb2cd6e2693474d9d209e479947bd51ff457b3277b3d95d5/core-system-conf +conf=/home/ccx/versions/core-system-conf.9ee0a2606fc6aa0b9eeebeba1e76caa69688ad8392f5d3de40e48078fac5897e/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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} diff --git a/packages/default.environment b/packages/default.environment @@ -1,30 +1,30 @@ -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+diffutils.0c0a86c684fdbea1fefd4daa512ca40fb323826b030f6067e72292f8cd1dfb63 -#+patch.1aeca1defbb73a622068d3e9736bb073581074d63ac123725cdb8fc0c35a1949 -#+flex.c462af2bf7558e744a4a40f0c344b872b13a128f13fe07ff9101af794bc31fd8 -#+bison.25d60ed3d1b2b0358c693370edd592daca4ba319e15a8a06e12c7cb494165f24 -#+rsync.27f4e5a50a5d8bd711b0d9a3299697c0aeff0916048c1202a1a0aa02e6faf310 -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+s6.d8e122545ddfe10c791a8222e5abd3531713120037c2c78284e6a2ecbe985e4f -#+s6-rc.a5118483e35fbef8cfa98e21c2462685f0f55c7711738db7d79a42b370453ccb -#+s6-portable-utils.d405fc0a6e72970beed0d4f49e58b63aaa20f1efc57aa901fe362277e4a0425b -#+s6-linux-utils.d32a3513e3ffa2d9023c1b5535ea938191483285a92448cb4f875f37eb1e12b3 -#+s6-linux-init.bceeb8c67c962f5c58fae586db1e43bc4851de177691da074362ae45262d8157 -#+mdevd.3082f8e5f74f03eb5cef1bc7ff02c92b3ecd45d0530bc3c3ccd9f058589e6191 -#+s6-dns.405bd6bfa31c975ac583d0bc2f4e47624b53467a9af5cf0237c7b1f10f16c8b7 -#+s6-networking.b9dc976f10bbbef9dc73a8ad2751f3dd8787b79ad3a7b0340164b5760d3c1c23 -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd -#+aat.dd7188abfd64057191f506097019eb56bf04ba60eacc3f85eac62200d1dc6534 -#+confz.0bf2c3952d11257cbd73791b85f83be304d3de15af6a04875eb78ec5234be2ac -#+containers.a62c9a5565287daa582c1879597ae8fc4aec214acbfd9b0a392b30f36a12db69 -#+fileset.0721183e5f2c95de8f91e4cb919c6b7261302b875dad20c737fa49f7dd19bef0 -#+logincaps.4a87c1c19c56e765f9424cb5b40f555f6e249fe604ad6b56f56c350f49f7bf44 -#+snaprep.f3ac6c90a39812487b73d9b8c5875a500620c136e8dfde7db34d32f7474cb682 -#+core-system-conf.df1bc443073bd543cb2cd6e2693474d9d209e479947bd51ff457b3277b3d95d5 -#+core-system-rc.9c307525685adbc8b3840a00956aeffa421ede1bfb67cef94de7a7d945a49f9f -#+core-system-scripts.ee83f6c89d2571787e6ae8f40a5d5781b473e665d26afd471b32b40a14779e7e -#+core-system-init.1e07d3d7806644578c6b9641411a81deee4728b5dfaa48e0cff7312291ad88f1 -#+linux.8892adc8115c08412ed354e292a45a5eae0447ad4411ac2ef1076377412f5c0f- \ No newline at end of file +#+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 diff --git a/packages/diffutils b/packages/diffutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70/lib" +export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 -#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 +#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 #@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.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 +#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { @@ -40,7 +40,7 @@ autotools() { -mcm=/home/ccx/versions/musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 +mcm=/home/ccx/versions/musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+diffutils.0c0a86c684fdbea1fefd4daa512ca40fb323826b030f6067e72292f8cd1dfb63 -#+patch.1aeca1defbb73a622068d3e9736bb073581074d63ac123725cdb8fc0c35a1949 -#+flex.c462af2bf7558e744a4a40f0c344b872b13a128f13fe07ff9101af794bc31fd8 -#+bison.25d60ed3d1b2b0358c693370edd592daca4ba319e15a8a06e12c7cb494165f24 -#+rsync.27f4e5a50a5d8bd711b0d9a3299697c0aeff0916048c1202a1a0aa02e6faf310 -#+libelf-compat.a5a3a16b9f3d0a900fcf2a1a5e5b3c60d84f1f48af13f40c5dde26e68b462cba +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+diffutils.ec12c9a0ba8cf01565a5909a5c5e03711494851c611d022897386e818db2d9a7 +#+patch.011ef5d8d3de3953e02cec649dc4f3774ac95cc2b20a5e8e67591ef8a9c091cf +#+flex.de23d389e9c49babee1518132539e41cc9bf773238edcea8eb6ba09465ebc279 +#+bison.2f24ecc2c2547d88d237ebc57cb86ec50de0e9b66b4d135572ccfcf9ac8e339b +#+rsync.18830ac505c332ddb752f370f0dc4199a29d606862f8a443044a85531462781a +#+libelf-compat.ba0f97c03e7688ba05d2e8e08f238ae041ab7572269a274a1e619d73afe16443 #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 -#+gmp.3b506b05cef561f1d2ab9c0235c1a7d56893b2e2721ce07e06621107a7320bd3 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+gmp.d0b33598246b5357db03915a67e7ac280c5c427ea78423d3c3ce0d2fc1362e79 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 -#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 -#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 +#+musl-cross-make.8e71488b9cdaaf4456fa5fe7373b76c78f23cc7935a238364d5f37c2dd1ef163 +#+gnu-make.1fcda0615804b0b79ec448d2e12d2a8874f9cde022d037b17ff380b758c0bfd4 +#+busybox.d87ba6d595df2002243c0e8766da7b35515bbaac6ea62f0f70075ba5526d1368 #@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 @@ -24,13 +24,14 @@ printf '%s\n' >musl-cross-make/config.mak \ 'st=-static --static' \ 'fl=-g0 -O2' \ 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ - 'COMMON_CONFIG += CC="x86_64-linux-musl-gcc ${st}" CXX="x86_64-linux-musl-g++ ${st}"' \ - 'HOSTCC=x86_64-linux-musl-gcc ${st}' + 'COMMON_CONFIG += CC="x86_64-linux-musl-gcc ${st}" CXX="x86_64-linux-musl-g++ ${st}"' 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-|' '{}' \; + 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 @@ -17,9 +17,13 @@ printf '%s\n' >musl-cross-make/config.mak \ "TARGET=x86_64-linux-musl" \ 'fl=-g0 -O2' \ '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-|' '{}' \; + make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install + "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" 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.96e6501dce1d35d3debcc35756f15d7568a3a994a3bb4109b3ab3660715e83d5 +#+musl-cross-make.37eeac552d7459ba9108d00708ca313a91b503a0531f62963cfb68c79f45272d #@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,9 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} -bootstrap=/home/ccx/versions/musl-cross-make.96e6501dce1d35d3debcc35756f15d7568a3a994a3bb4109b3ab3660715e83d5 +bootstrap=/home/ccx/versions/musl-cross-make.37eeac552d7459ba9108d00708ca313a91b503a0531f62963cfb68c79f45272d +"$bootstrap/bin/x86_64-linux-musl-gcc" --version + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ 'GCC_VER=11.2.0' \ @@ -23,13 +25,14 @@ printf '%s\n' >musl-cross-make/config.mak \ "bbin=$bootstrap/bin" \ 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ '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-|' '{}' \; + export PATH="$bootstrap/bin:$PATH" make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install -"$bootstrap/bin/x86_64-linux-musl-gcc" --version -make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make -make -C musl-cross-make install + "${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd #@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.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 -#+popt.d217489a1938aacc8da3a92495cdec8624d981f3a0316469dc5825d187406415 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+popt.49bcaf410f20f0dfe824aa211baaeed76d2e7323c3f9f4a6de6e854f93fbfa87 #@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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+patch.1aeca1defbb73a622068d3e9736bb073581074d63ac123725cdb8fc0c35a1949 -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+patch.011ef5d8d3de3953e02cec649dc4f3774ac95cc2b20a5e8e67591ef8a9c091cf +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+s6.d8e122545ddfe10c791a8222e5abd3531713120037c2c78284e6a2ecbe985e4f +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+s6.d8e122545ddfe10c791a8222e5abd3531713120037c2c78284e6a2ecbe985e4f -#+s6-dns.405bd6bfa31c975ac583d0bc2f4e47624b53467a9af5cf0237c7b1f10f16c8b7 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 +#+s6-dns.f2264e9ce842a15d4af786dd25bea8811eb618600e993e96e51e8d1bd7b0795c #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+skalibs.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+s6.d8e122545ddfe10c791a8222e5abd3531713120037c2c78284e6a2ecbe985e4f +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38 +#+execline.15efde9814bfc0614a74c9167e051efbb13554cdc900681758ab500e5ac1df0d +#+s6.2d30af15edc8c552d6f6f67258f68cfa537e9c6600a3262745f5fda851b49373 #@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.c77158e2774a4beeada29b8eda64aae947bc5d503e25bc21bd9e3aec1a0dca6e/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.6b0cf2ac5302a31ec6f4c55d82a272172ea190d80bb9617d376058c2107b4e38/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.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} diff --git a/packages/snaprep b/packages/snaprep @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+zsh.00aef1a53f84686b2ae71adce2209c4a53bc93af6f3477afc77c0cc8ffe857e5 +#+pthbs-banginstall.3221a87a84754ca950720ef48f93b13e6c77574bac1c1d125392c742a240e0c7 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,29 +1,29 @@ -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+diffutils.0c0a86c684fdbea1fefd4daa512ca40fb323826b030f6067e72292f8cd1dfb63 -#+patch.1aeca1defbb73a622068d3e9736bb073581074d63ac123725cdb8fc0c35a1949 -#+flex.c462af2bf7558e744a4a40f0c344b872b13a128f13fe07ff9101af794bc31fd8 -#+bison.25d60ed3d1b2b0358c693370edd592daca4ba319e15a8a06e12c7cb494165f24 -#+rsync.27f4e5a50a5d8bd711b0d9a3299697c0aeff0916048c1202a1a0aa02e6faf310 -#+execline.bec98b522b1dea9f5459caeb94adc41f96267bbf088357e559e0160fa72fca3c -#+s6.d8e122545ddfe10c791a8222e5abd3531713120037c2c78284e6a2ecbe985e4f -#+s6-rc.a5118483e35fbef8cfa98e21c2462685f0f55c7711738db7d79a42b370453ccb -#+s6-portable-utils.d405fc0a6e72970beed0d4f49e58b63aaa20f1efc57aa901fe362277e4a0425b -#+s6-linux-utils.d32a3513e3ffa2d9023c1b5535ea938191483285a92448cb4f875f37eb1e12b3 -#+s6-linux-init.bceeb8c67c962f5c58fae586db1e43bc4851de177691da074362ae45262d8157 -#+mdevd.3082f8e5f74f03eb5cef1bc7ff02c92b3ecd45d0530bc3c3ccd9f058589e6191 -#+s6-dns.405bd6bfa31c975ac583d0bc2f4e47624b53467a9af5cf0237c7b1f10f16c8b7 -#+s6-networking.b9dc976f10bbbef9dc73a8ad2751f3dd8787b79ad3a7b0340164b5760d3c1c23 -#+zsh.b1ae448ac448333c2297fbf36b1b582b20d8890b154da6d90745df775f9a94d1 -#+pthbs-banginstall.935af2c1b095e2a9e45d7c65ed13b5223c51426bfa85a6a6ddda63ba8e73ebdd -#+aat.dd7188abfd64057191f506097019eb56bf04ba60eacc3f85eac62200d1dc6534 -#+confz.0bf2c3952d11257cbd73791b85f83be304d3de15af6a04875eb78ec5234be2ac -#+containers.a62c9a5565287daa582c1879597ae8fc4aec214acbfd9b0a392b30f36a12db69 -#+fileset.0721183e5f2c95de8f91e4cb919c6b7261302b875dad20c737fa49f7dd19bef0 -#+logincaps.4a87c1c19c56e765f9424cb5b40f555f6e249fe604ad6b56f56c350f49f7bf44 -#+snaprep.f3ac6c90a39812487b73d9b8c5875a500620c136e8dfde7db34d32f7474cb682 -#+core-system-conf.df1bc443073bd543cb2cd6e2693474d9d209e479947bd51ff457b3277b3d95d5 -#+core-system-rc.9c307525685adbc8b3840a00956aeffa421ede1bfb67cef94de7a7d945a49f9f -#+core-system-scripts.ee83f6c89d2571787e6ae8f40a5d5781b473e665d26afd471b32b40a14779e7e -#+core-system-init.1e07d3d7806644578c6b9641411a81deee4728b5dfaa48e0cff7312291ad88f1- \ No newline at end of file +#+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 diff --git a/packages/zsh b/packages/zsh @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.8926fe5aca72c801ac275ca0b9516363afab70b89db172cb4c6b3559ce200f70 -#+gnu-make.7476342d7eeb6927880db74bf934fc6ebaf72f2e4d9f50eeba90cd9bf5f01ac2 -#+busybox.74a7d08970030de8aa026d6bb0822f6b1cf3a0dc44e3d839ba470765111a443a -#+busybox-diffutils.0781d5d3872e8424a45dc23ae29ed97650a18d1c78922a1c0fd0b6a422ed8303 -#+m4.f5af4002d0b9ccd3298e3bda6482ffd78d669714b1ee1e98f8053ea0144557e0 -#+netbsd-curses.4f3d7b7b7f6216a285a8da616f952d1d71f5a08fdf350601ea05ccfc3f9e9aa9 +#+musl-cross-make.8df7e21993f28947ea69f876ac3185ac7e920c7237d0bc03163cbae827143967 +#+gnu-make.1de08de65c34127f735e0f735fcf8e99e53a9b671bb8b3c8af3273ffce935554 +#+busybox.ee0bfe122b7174c0b1e7ff3f327e789a405dda1b8e2a47bb26685804bea9d92a +#+busybox-diffutils.ddbbaf9bb9d44288f75a8c4cde62bc807065091a3952200f310d8a8ace3c98a1 +#+m4.c0efb74cb14836fc16d8aee56c92e8b037d1e15bf37e2ae0543ce0be0e7913cd +#+netbsd-curses.68b6ade4a859deab9d5b4f1f7d8be7c749dc97b3d13a71d5022161cf4e9be74d #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -25,13 +25,14 @@ printf '%s\n' >musl-cross-make/config.mak \ 'st=-static --static' \ 'fl=-g0 -O2' \ 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ - 'COMMON_CONFIG += CC="{{triplet}}-gcc ${st}" CXX="{{triplet}}-g++ ${st}"' \ - 'HOSTCC={{triplet}}-gcc ${st}' + 'COMMON_CONFIG += CC="{{triplet}}-gcc ${st}" CXX="{{triplet}}-g++ ${st}"' 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-|' '{}' \; + {{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 @@ -18,9 +18,13 @@ printf '%s\n' >musl-cross-make/config.mak \ "TARGET={{triplet}}" \ 'fl=-g0 -O2' \ '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-|' '{}' \; + {{make}} -C musl-cross-make make -C musl-cross-make install + "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version {% endblock %} {% block genlinks_begin %} diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1 @@ -15,6 +15,8 @@ : ${JOBS:=1} bootstrap={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-0")}} +"$bootstrap/bin/{{triplet}}-gcc" --version + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ 'GCC_VER=11.2.0' \ @@ -24,13 +26,14 @@ printf '%s\n' >musl-cross-make/config.mak \ "bbin=$bootstrap/bin" \ 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ '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-|' '{}' \; + export PATH="$bootstrap/bin:$PATH" {{make}} -C musl-cross-make make -C musl-cross-make install -"$bootstrap/bin/{{triplet}}-gcc" --version -{{make}} -C musl-cross-make -make -C musl-cross-make install + "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version {% endblock %} {% block genlinks_begin %}