logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>
commit: 8e6fa2fcce47b7ca2627bde0ea8c29934b8bc9c4
parent d163ae3ca55092a25b6a93ec88d352658dfd9a2b
Author: Samuel Tyler <fosslinux@aussies.space>
Date:   Mon, 10 Feb 2025 13:23:07 +1100

Merge pull request #506 from fosslinux/perl-fixup

Perl fixes

Diffstat:

Msteps/SHA256SUMS.pkgs2+-
Msteps/perl-5.6.2/pass1.sh18++++++++++++++++--
Msteps/perl5.005-03/pass1.sh3++-
3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs @@ -101,7 +101,7 @@ f00f063a754baf1e00d5d0a76680a74232f5f34d754a17c8fcd853d86cf9c1c6 openssl-3.0.13 a2cbb76d60e5df1ae2439297f9e01fe9903175db600d65efb4a45e3bdaa12eb2 perl5.005-03_0.tar.bz2 936c7f8f6fdc942a0f674c8169b04f4fd30011c980455cf77c80c494136927ef perl-5.10.1_0.tar.bz2 8047105ef794a2a99803d671acf9e3bb65b852b57cb0aa62b30f62b7bdc1e3ff perl-5.32.1_0.tar.bz2 -65374665ede69c1b7944daa4658d90b9be21923f395ab0aac8f0fd2162d57705 perl-5.6.2_0.tar.bz2 +f3861d80b243a2d4128a26388d21471cce4ea26df79304a3285c2ce848d8f2b1 perl-5.6.2_0.tar.bz2 5eefece54c40df95f3e330162a57adab691b0036b5a1c103d21ee2026c0b91ea pkg-config-0.29.2_0.tar.bz2 1d46223a1df9597f991fec88bdfc4cd25cb7d3d0a25a65cc5d5019861fd0f5e0 python-2.0.1_0.tar.bz2 dde16a4b5e5fa049e394b7f7f8717a94507cbfc8b8ce9bc25b5eea0b19323857 python-2.0.1_1.tar.bz2 diff --git a/steps/perl-5.6.2/pass1.sh b/steps/perl-5.6.2/pass1.sh @@ -14,17 +14,25 @@ src_prepare() { mv perly.tab.h perly.h # Regenerate other prebuilt header files - for file in embed keywords opcode; do + rm -f proto.h pp.sym pp_proto.h perlapi.c perlapi.h opnames.h opcode.h \ + objXSUB.h embedvar.h global.sym + for file in opcode embed keywords; do rm -f ${file}.h perl ${file}.pl done rm -f regnodes.h perl regcomp.pl - rm -f ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c + rm -f ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm perl bytecode.pl rm -f warnings.h lib/warnings.pm perl warnings.pl + # Regenerate prebuilt perl files + rm -r lib/unicode/Is lib/unicode/In lib/unicode/To lib/unicode/*.pl + + # Manpages + rm lib/Pod/Man.pm + # Workaround for some linking problems, remove if possible sed -i 's/perl_call_method/Perl_call_method/' ext/Data/Dumper/Dumper.xs sed -i 's/perl_call_sv/Perl_call_sv/' ext/Data/Dumper/Dumper.xs @@ -36,4 +44,10 @@ src_prepare() { src_compile() { make -j1 PREFIX="${PREFIX}" + + cd lib/unicode + # We don't use the Makefile because $0 is encoded and it uses ./mktables.PL + # whereas the original uses mktables.PL + ../../miniperl -I../../lib mktables.PL + cd ../.. } diff --git a/steps/perl5.005-03/pass1.sh b/steps/perl5.005-03/pass1.sh @@ -13,12 +13,13 @@ src_prepare() { mv perly.tab.h perly.h # Regenerate other prebuilt header files + rm -f embedvar.h for file in embed keywords opcode; do rm -f ${file}.h perl ${file}.pl done rm -f regnodes.h perl regcomp.pl - rm -f fbyterun.h byterun.c + rm -f byterun.h byterun.c ext/B/B/Asmdata.pm perl bytecode.pl }