commit 9ff6eb66a24eae616f459ba1cbc9791493551668 parent 5dd944fcb1e352777c8654cbcee3ec7b6c1d84cf Author: Jan Pobříslo <ccx@te2000.cz> Date: Tue, 20 Feb 2024 23:08:29 +0100 Try to validate the dynamic linker path after build Diffstat:
53 files changed, 337 insertions(+), 273 deletions(-)
diff --git a/packages/aat b/packages/aat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f -#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+flex.5c320b46fa7d537c096fc4557bb01e6203fbe59935312034f793557e30a8dee5 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. autotools() { diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 -#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 -#+musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943- \ No newline at end of file +#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 +#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 +#+musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60+ \ 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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 -#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 +#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf 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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf 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.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 -#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 +#+musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 +#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} -mcm=/home/ccx/versions/musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 -make=/home/ccx/versions/gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 +mcm=/home/ccx/versions/musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 +make=/home/ccx/versions/gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} diff --git a/packages/containers b/packages/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+aat.f59b4ac18cf6e5bb34670b26d64d5849bf1f764fc05c8d63bd1313394de6072b -#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+diffutils.4893712c93d3e870c3f69ce80975f398f5bbd6cfb835e2ae0b6ecb117331dfb7 +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+aat.ccfe4f5b065b462408cf10e961882d739d06e66729263765480eebec4a8d4f36 +#+fileset.8cab99a2ee720774b7ff550728c54827b5b50b66983e0c54c619649c5dfc7a07 #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f -#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e -#+s6-portable-utils.799b134eec090dd92283a59796ac8972e5bf301c3cb972bffd097db6e6e403a9 -#+s6-linux-init.fa9f0519d9550645318b1bb904d6fe27cb158a0009b0c2555b659f373744343d -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c - -s6rcdb=/home/ccx/versions/core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c/s6-rc-db +#+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 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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e -#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f -#+core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+s6-rc.8184a09e45b50e8e7d072622608c4ab704e3cdf431ab60ac27e9b37f2e8b6132 +#+fileset.8cab99a2ee720774b7ff550728c54827b5b50b66983e0c54c619649c5dfc7a07 +#+core-system-conf.86763eb22a7d3bc279894f5f4c00f18ee2e4965b2ba01a382b0e09f84436aa54 -conf=/home/ccx/versions/core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c/core-system-conf +conf=/home/ccx/versions/core-system-conf.86763eb22a7d3bc279894f5f4c00f18ee2e4965b2ba01a382b0e09f84436aa54/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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} diff --git a/packages/default.environment b/packages/default.environment @@ -1,30 +1,30 @@ -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 -#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a -#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 -#+bison.63d0b360b3b7e830d2ae8bac332f578217178551cc7d96ef0fe5489fc83b8ecd -#+rsync.c749a3ea3808d2d88a6bf1bbf1e6cb1f97f4ef9c5148c1a218bd8b415621ac1a -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f -#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e -#+s6-portable-utils.799b134eec090dd92283a59796ac8972e5bf301c3cb972bffd097db6e6e403a9 -#+s6-linux-utils.9b3c053ca45a2713bf97bd0ddebbe5a9daa8feff99eac7b5a33c3d084945e85d -#+s6-linux-init.fa9f0519d9550645318b1bb904d6fe27cb158a0009b0c2555b659f373744343d -#+mdevd.e7c10fce5e27b01a74e389e32993fe57e5068fb725896a1a2abca01f4d8027eb -#+s6-dns.9156a25c395337313b4297a49537e982d0941366a12e571e62ee5cec4240c78d -#+s6-networking.16cf49361c09f26e8837ff8b60752de3d3aa296f1688f22902a36b4fec56502b -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 -#+aat.f59b4ac18cf6e5bb34670b26d64d5849bf1f764fc05c8d63bd1313394de6072b -#+confz.3b4a9818cb779bd41506ca0da3443a895e9ad8c9447dce05d81fd3231d17eaa0 -#+containers.daa87e5837d077c04985d52124c55acd91c6ca8935c855adb23e6696ead7cfcf -#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f -#+logincaps.197e175f2c8203cdd9f62f28f0fb9c81a54cddb674ee5da63037901c8d86198a -#+snaprep.55df59a8767e7713966279a334bdda285f2b92e54974423bda875a69b6f6ae1e -#+core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c -#+core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c -#+core-system-scripts.ea9e3496477cdfc681d399f2e3191357082ad6833651f97328be2a2c1eef8090 -#+core-system-init.f23b8c0afd2324d04e2440fb4b78261719e2fd08e871a0fbfa9081f3ac79695f -#+linux.2aa12ea1c0883fe8c535f961b518f72ed1423161b9497f6a5e5bfded36d505a2- \ No newline at end of file +#+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 diff --git a/packages/diffutils b/packages/diffutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0/lib" +export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 -#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 +#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 #@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.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 +#+musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { @@ -40,7 +40,7 @@ autotools() { -mcm=/home/ccx/versions/musl-cross-make.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 +mcm=/home/ccx/versions/musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 -#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a -#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 -#+bison.63d0b360b3b7e830d2ae8bac332f578217178551cc7d96ef0fe5489fc83b8ecd -#+rsync.c749a3ea3808d2d88a6bf1bbf1e6cb1f97f4ef9c5148c1a218bd8b415621ac1a -#+libelf-compat.0be0047db143a5871b4de4943533fdd2e3d3f3468d8828dd0b4ce8311953ebda +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+diffutils.4893712c93d3e870c3f69ce80975f398f5bbd6cfb835e2ae0b6ecb117331dfb7 +#+patch.37b4615e7aabb87d21334b2f88f4a7d748bab2c49ee04bdb14a47add5040932c +#+flex.5c320b46fa7d537c096fc4557bb01e6203fbe59935312034f793557e30a8dee5 +#+bison.4e6761e12a8ed5b711622d5016a892170eee37674123c01fb3d9962fea6347fd +#+rsync.8f9c022f5d9dce513115338a9af6803fd9b6523daf0370f51f51b90ce662e052 +#+libelf-compat.240c51f37b1cc4fe762fc0fe3174e855ec8ad471341743984d1afa6b53e24d8f #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f -#+gmp.ec42f91cab2a8c214ff30955fbdb70b3cbcda02bc812e495f53734540da06b8b +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+gmp.60461567cc0ada0a16cb6590b25018801da8f985bcce2eafcbb05858b370d92b #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.abdae0812b949943f08c1953ef00d22922ae430f709ee47c5c1ca8a51dab9943 -#+gnu-make.7bdf0c081dc5f12e384980fb545db65e303add7c3ec8dcc604874ddc04515e45 -#+busybox.2505a58063b1b6e0d6f5d88ec4e3c694476391477fec3755458b7b4726ebe787 +#+musl-cross-make.58dd0481a5ce8939e48ff578a8768dce54fa5462ad575488a0696a5ee46acd60 +#+gnu-make.74a63ceda4659a6ac0d53c37075befff00ec118211d5b0f6e815f0c23529d6d1 +#+busybox.2929905474099967ad85a93aec36690c1fa4ad44bcebfa85b19c1e12b615a006 #@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 @@ -16,6 +16,9 @@ : ${JOBS:=1} +# For validating the compiler +printf '%s\n' 'int main(void) { return 0; }' >true.c + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ "TARGET=x86_64-linux-musl" \ @@ -35,6 +38,12 @@ 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 $? +# 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 +"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker +grep -F "$pthbs_package" true.linker + dd=$pthbs_destdir//home/ccx/versions/$pthbs_package pkgs="gmp intl mpc mpfr zlib" #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin" diff --git a/packages/musl-cross-make:bootstrap-0 b/packages/musl-cross-make:bootstrap-0 @@ -12,6 +12,10 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} + +# For validating the compiler +printf '%s\n' 'int main(void) { return 0; }' >true.c + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ "TARGET=x86_64-linux-musl" \ @@ -19,12 +23,20 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; + +# Patch linker path for dynamic executables +make -C musl-cross-make gcc-9.4.0 +sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install +# 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 +"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker +grep -F "$pthbs_package" true.linker + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' 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.78855e2f8857b2bcc7d7e1c65fef969d5e020177f97c9cb2dec38fc2edec82b3 +#+musl-cross-make.42b01c488ac6b72c2316c9f3210f345ced52f042d0c32b7bbc4c2c7c5985e1b0 #@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,9 +13,12 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} -bootstrap=/home/ccx/versions/musl-cross-make.78855e2f8857b2bcc7d7e1c65fef969d5e020177f97c9cb2dec38fc2edec82b3 +bootstrap=/home/ccx/versions/musl-cross-make.42b01c488ac6b72c2316c9f3210f345ced52f042d0c32b7bbc4c2c7c5985e1b0 "$bootstrap/bin/x86_64-linux-musl-gcc" --version +# For validating the compiler +printf '%s\n' 'int main(void) { return 0; }' >true.c + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ 'GCC_VER=11.2.0' \ @@ -27,13 +30,21 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CC="${bbin}/x86_64-linux-musl-gcc ${st}" CXX="${bbin}/x86_64-linux-musl-g++ ${st}"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' '{}' \; + +# Patch linker path for dynamic executables +make -C musl-cross-make gcc-11.2.0 +sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h export PATH="$bootstrap/bin:$PATH" make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make make -C musl-cross-make install +# 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 +"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker +grep -F "$pthbs_package" true.linker + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b #@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.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f -#+popt.2bd1ba55f9bddfb990a37f57666f13b206f5e83b4445cd528dcfa4a81380d508 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+popt.37cb826142fd3be836bd6d3ebceb5879fa323c8f3550bfdba30b716a22df7d41 #@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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+patch.37b4615e7aabb87d21334b2f88f4a7d748bab2c49ee04bdb14a47add5040932c +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f -#+s6-dns.9156a25c395337313b4297a49537e982d0941366a12e571e62ee5cec4240c78d +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 +#+s6-dns.5e1bf0d27be4ca2cdb85e71c6a5f5027b9ec7b2e212d70bb10ff7317a2c4073d #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+skalibs.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37 -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18 +#+execline.82e0869adc8c42a99c7963b1b3f40ea3cc927c762edf25fa97746f7d23b17626 +#+s6.ac8aaf315e12965ebeb3f1b3b76c75c0d9bba894bdac9e2b0c5411eda96aba89 #@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.a5ac19f19d139f7bebd9b5f8379c2e2f41ffebada14832195b9daa12833cfe37/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.c2ff9e1b3331238af4efc423fdf6b75fd4c6b49fe91b8cf0c6ad52564108dd18/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.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} diff --git a/packages/snaprep b/packages/snaprep @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+zsh.5c8142c5e6593336dfb02ca7398e4d0f660b48859c44cb5244c07a21177271fa +#+pthbs-banginstall.a7df8377ceacc1c05de054bacef2b02393171432a41d7809a55c4caa59bebe75 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,29 +1,29 @@ -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+diffutils.5c2ebefd5579755ef406781a533f5a5d93abc975d07aa5ff4314286d5390a140 -#+patch.1819854f7a741e3c4fd616d2dd61e0a8e7da1314aecda33c49533a8053496c8a -#+flex.a716c18f29cb638e12501d45c2a25ac8126844bdcd44b2d97d961e5c43626238 -#+bison.63d0b360b3b7e830d2ae8bac332f578217178551cc7d96ef0fe5489fc83b8ecd -#+rsync.c749a3ea3808d2d88a6bf1bbf1e6cb1f97f4ef9c5148c1a218bd8b415621ac1a -#+execline.dbff616b8bad3d8a48d929881c0954400fd6a2736fba349c421289009232b84b -#+s6.c2bf8a2bf242820e9b36aab0b39fd136b133d831c9ca17f2e8ab2cd9f3de977f -#+s6-rc.a063c19e2e1c9ae113ac8a2933c1c05a8d5492daab4a323c468a8e3176e8920e -#+s6-portable-utils.799b134eec090dd92283a59796ac8972e5bf301c3cb972bffd097db6e6e403a9 -#+s6-linux-utils.9b3c053ca45a2713bf97bd0ddebbe5a9daa8feff99eac7b5a33c3d084945e85d -#+s6-linux-init.fa9f0519d9550645318b1bb904d6fe27cb158a0009b0c2555b659f373744343d -#+mdevd.e7c10fce5e27b01a74e389e32993fe57e5068fb725896a1a2abca01f4d8027eb -#+s6-dns.9156a25c395337313b4297a49537e982d0941366a12e571e62ee5cec4240c78d -#+s6-networking.16cf49361c09f26e8837ff8b60752de3d3aa296f1688f22902a36b4fec56502b -#+zsh.61d8df07b74158d84e2e32f992a6aee3a16480460be58db97762fb640770baca -#+pthbs-banginstall.95349cf5aefb74e87f8c2c321cb038286a0b1e5cca6c8702d70e69a1cdd3e979 -#+aat.f59b4ac18cf6e5bb34670b26d64d5849bf1f764fc05c8d63bd1313394de6072b -#+confz.3b4a9818cb779bd41506ca0da3443a895e9ad8c9447dce05d81fd3231d17eaa0 -#+containers.daa87e5837d077c04985d52124c55acd91c6ca8935c855adb23e6696ead7cfcf -#+fileset.6059ae80420885f14f844d1ae854b80431907a8a13957aec2b63ccbe445e233f -#+logincaps.197e175f2c8203cdd9f62f28f0fb9c81a54cddb674ee5da63037901c8d86198a -#+snaprep.55df59a8767e7713966279a334bdda285f2b92e54974423bda875a69b6f6ae1e -#+core-system-conf.00b8e92bcd627ad576c7c39d4d63579d2625e35eec028ed29855797b14293e2c -#+core-system-rc.57477dcfea03532370aab9dc40d52334376a54f06bd17422e7ea428f19097e5c -#+core-system-scripts.ea9e3496477cdfc681d399f2e3191357082ad6833651f97328be2a2c1eef8090 -#+core-system-init.f23b8c0afd2324d04e2440fb4b78261719e2fd08e871a0fbfa9081f3ac79695f- \ No newline at end of file +#+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 diff --git a/packages/zsh b/packages/zsh @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.6e61fa21696c3faec90d306fd90baab9013bb11a1c7ab0cd5ac7660214d546f0 -#+gnu-make.616ae263a6baffceead7360bfb624e4d9ff4cacaf2b30e710d7407808c0504ee -#+busybox.94d13a51d7ad15e5691d7a30e6410ea7c1e29058bd0a132486c8a2ebb77618d0 -#+busybox-diffutils.c053db51b72445321639d1e46ea48184c6c1e77c9a7e458495d94f57762f9566 -#+m4.8b03bdf0f0aaa858df1147f3be272447609ddfb2a47ed4bcbcf7f90081f7ac1f -#+netbsd-curses.13cb5c3606b719f78f384b4c38b9a61cb9a3f1de5eb4d787ef294ccdff710e4b +#+musl-cross-make.bfcefac99a8ac02b8b4262baaac96e5934d84434225a36ecea4c9aa316140d1e +#+gnu-make.9bf7fb7c9bb56a0b8e598921b1116da33515ee38967ccc1cf520d0e5bbfbb27f +#+busybox.87c2f9f523856e73913fa7ccbc2ae1ebc988e405733b5a54e8be1cebd6572ddf +#+busybox-diffutils.025117d34a8666c7a1f13f57bd217de63882befe4fcdf922fd056ce9bfcf27e6 +#+m4.13a54f03e8e557be5f0c743689222189d682257536224e6faf617ea6cbf52f4b +#+netbsd-curses.6235a2619be8f724901a71e3950739c2db7d4207647178ad0b245044bf905dcc #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -17,6 +17,9 @@ : ${JOBS:=1} +# For validating the compiler +printf '%s\n' 'int main(void) { return 0; }' >true.c + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ "TARGET={{triplet}}" \ @@ -36,6 +39,12 @@ 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 $? +# Validate the compiler +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-readelf' --string-dump=.interp true >true.linker +grep -F "$pthbs_package" true.linker + dd=$pthbs_destdir/{{versions}}/$pthbs_package pkgs="gmp intl mpc mpfr zlib" #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin" diff --git a/templates/pkg/musl-cross-make:bootstrap-0 b/templates/pkg/musl-cross-make:bootstrap-0 @@ -13,6 +13,10 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} + +# For validating the compiler +printf '%s\n' 'int main(void) { return 0; }' >true.c + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ "TARGET={{triplet}}" \ @@ -20,12 +24,20 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; + +# Patch linker path for dynamic executables +make -C musl-cross-make gcc-9.4.0 +sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h {{make}} -C musl-cross-make make -C musl-cross-make install +# Validate the compiler "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-readelf' --string-dump=.interp true >true.linker +grep -F "$pthbs_package" true.linker + {% endblock %} {% block genlinks_begin %} x["./bin/{{triplet}}-g++"]=1 diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1 @@ -17,6 +17,9 @@ bootstrap={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-0")}} "$bootstrap/bin/{{triplet}}-gcc" --version +# For validating the compiler +printf '%s\n' 'int main(void) { return 0; }' >true.c + printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ 'GCC_VER=11.2.0' \ @@ -28,13 +31,21 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CC="${bbin}/{{triplet}}-gcc ${st}" CXX="${bbin}/{{triplet}}-g++ ${st}"' touch musl-cross-make/sources/* -find musl-cross-make/patches/gcc* -name '*.diff' -exec sed -i -e '/^+/s|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' '{}' \; + +# Patch linker path for dynamic executables +make -C musl-cross-make gcc-11.2.0 +sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h export PATH="$bootstrap/bin:$PATH" {{make}} -C musl-cross-make make -C musl-cross-make install +# Validate the compiler "${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-readelf' --string-dump=.interp true >true.linker +grep -F "$pthbs_package" true.linker + {% endblock %} {% block genlinks_begin %} x["./bin/{{triplet}}-g++"]=1