From a888adde33edc7d09daece06f58490a1f87ace2c Mon Sep 17 00:00:00 2001 From: Samuel Tyler Date: Mon, 8 Sep 2025 10:59:57 +1000 Subject: [PATCH] Actually we don't need 5.40.3 --- steps/manifest | 2 - .../files/Compress-Raw-Zlib_config.in | 10 -- steps/perl-5.40.3/pass1.sh | 98 ------------------- .../patches/Devel-PPPort-remove-sprintf.patch | 21 ---- .../patches/fix-debugging-re.patch | 21 ---- .../patches/remove-machine-generated.patch | 23 ----- steps/perl-5.40.3/sources | 2 - steps/perl-5.42.0/pass1.sh | 4 +- .../patches/mk_invlists-remove-any.patch | 2 +- 9 files changed, 4 insertions(+), 179 deletions(-) delete mode 100644 steps/perl-5.40.3/files/Compress-Raw-Zlib_config.in delete mode 100755 steps/perl-5.40.3/pass1.sh delete mode 100644 steps/perl-5.40.3/patches/Devel-PPPort-remove-sprintf.patch delete mode 100644 steps/perl-5.40.3/patches/fix-debugging-re.patch delete mode 100644 steps/perl-5.40.3/patches/remove-machine-generated.patch delete mode 100644 steps/perl-5.40.3/sources diff --git a/steps/manifest b/steps/manifest index 95bd131b..7709ab1e 100644 --- a/steps/manifest +++ b/steps/manifest @@ -192,8 +192,6 @@ build: perl-5.30.3 build: perl-Devel-Tokenizer-C-0.11 build: perl-5.36.3 build: perl-Devel-Tokenizer-C-0.11 -build: perl-5.40.3 -build: perl-Devel-Tokenizer-C-0.11 build: perl-5.42.0 build: gperf-3.1 build: libunistring-0.9.10 diff --git a/steps/perl-5.40.3/files/Compress-Raw-Zlib_config.in b/steps/perl-5.40.3/files/Compress-Raw-Zlib_config.in deleted file mode 100644 index 22ffd510..00000000 --- a/steps/perl-5.40.3/files/Compress-Raw-Zlib_config.in +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: 2025 fosslinux -# -# SPDX-License-Identifier: MIT - -BUILD_ZLIB = False -ZLIB_INCLUDE = /usr/include -ZLIB_LIB = /usr/lib/i386-unknown-linux-musl -OLD_ZLIB = False -GZIP_OS_CODE = AUTO_DETECT -USE_ZLIB_NG = False diff --git a/steps/perl-5.40.3/pass1.sh b/steps/perl-5.40.3/pass1.sh deleted file mode 100755 index 8d133f1b..00000000 --- a/steps/perl-5.40.3/pass1.sh +++ /dev/null @@ -1,98 +0,0 @@ -# SPDX-FileCopyrightText: 2025 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default - - mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in - - # Remove miscellaneous pregenerated files - rm -f Porting/Glossary \ - dist/Devel-PPPort/parts/apidoc.fnc Configure config_h.SH \ - cpan/Win32API-File/cFile.pc cpan/Sys-Syslog/win32/Win32.pm \ - dist/ExtUtils-CBuilder/Makefile.PL \ - cpan/Test-Simple/lib/Test2/Util/HashBase.pm \ - cpan/Term-Table/lib/Term/Table/HashBase.pm \ - dist/Tie-File/Makefile.PL - rm win32/perlexe.ico - rm -r cpan/Compress-Raw-Zlib/zlib-src - - # Generated tests - rm cpan/Unicode-Collate/Collate/keys.txt - - # Regenerate other prebuilt header files - # Taken from headers of regen scripts - rm -f lib/warnings.pm warnings.h regnodes.h reentr.h reentr.c \ - overload.h opcode.h opnames.h pp_proto.h \ - keywords.h embed.h embedvar.h perlapi.{c,h} \ - proto.h lib/overload/numbers.pm regcharclass.h perly.{tab,h,act} \ - mg_{raw.h,vtable.h} keywords.c l1_char_class_tab.h \ - lib/feature.pm lib/B/Op_private.pm lib/unicore/uni_keywords.pl \ - miniperlmain.c unicode_constants.h uni_keywords.h \ - charclass_invlists.h ebcdic_tables.h mg_names.inc overload.inc \ - packsizetables.inc regexp_constants.h locale_table.h scope_types.h \ - charclass_invlists.inc - perl regen.pl - perl regen_perly.pl - perl regen/keywords.pl - perl regen/mk_PL_charclass.pl - perl regen/regcharclass.pl - perl regen/genpacksizetables.pl - perl regen/ebcdic.pl - perl regen/miniperlmain.pl - perl regen/unicode_constants.pl - perl lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p - mkdir lib_unicore - ln -s ../lib/unicore lib_unicore/ - perl -Ilib_unicore regen/mk_invlists.pl - - # regenerate configure - mconf_dir=$(echo ../metaconfig*) - ln -s "$mconf_dir"/.package . - ln -s "$mconf_dir"/U . - touch U/modified/{d_openat.U,d_vsnprintf.U,d_sched_yield.U} # null it - metaconfig -m - - # Glossary - ln -s ../perl-* "$mconf_dir"/perl - "$mconf_dir"/U/mkglossary > Porting/Glossary - - # Remove lines from MANIFEST that we have deleted - while read -r line; do - f="$(echo "${line}" | cut -d' ' -f1)" - if [ -e "${f}" ]; then - echo "${line}" - fi - done < MANIFEST > MANIFEST.new - mv MANIFEST.new MANIFEST -} - -src_configure() { - ./Configure -des \ - -Dprefix="${PREFIX}" \ - -Dcc=gcc \ - -Dusedl=false \ - -Ddate=':' \ - -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ - -Dmyhostname="(none)" \ - -Dmaildomain="(none)" -} - -src_compile() { - make "${MAKEJOBS}" pod/perlapi.pod - - pushd dist/Devel-PPPort - perl devel/mkapidoc.pl - popd - - default -} - -src_install() { - default - - # Remove messed up manpages - rm "${DESTDIR}/"*.0 -} diff --git a/steps/perl-5.40.3/patches/Devel-PPPort-remove-sprintf.patch b/steps/perl-5.40.3/patches/Devel-PPPort-remove-sprintf.patch deleted file mode 100644 index 7fb9ee27..00000000 --- a/steps/perl-5.40.3/patches/Devel-PPPort-remove-sprintf.patch +++ /dev/null @@ -1,21 +0,0 @@ -SPDX-FileCopyrightText: 2025 fosslinux - -SPDX-License-Identifier: Artistic-1.0 - -my_sprintf appears to be broken. -This should not be necessary, but is; is most likely linked to metaconfig -problems. - -diff --git perl-5.40.3/dist/Devel-PPPort/PPPort_pm.PL perl-5.40.3/dist/Devel-PPPort/PPPort_pm.PL -index cfbfaeb8fa..f93e56df15 100644 ---- perl-5.40.3/dist/Devel-PPPort/PPPort_pm.PL -+++ perl-5.40.3/dist/Devel-PPPort/PPPort_pm.PL -@@ -891,8 +891,6 @@ __DATA__ - - %include snprintf - --%include sprintf -- - %include exception - - %include strlfuncs diff --git a/steps/perl-5.40.3/patches/fix-debugging-re.patch b/steps/perl-5.40.3/patches/fix-debugging-re.patch deleted file mode 100644 index 98e95d24..00000000 --- a/steps/perl-5.40.3/patches/fix-debugging-re.patch +++ /dev/null @@ -1,21 +0,0 @@ -SPDX-FileCopyrightText: 2025 fosslinux - -SPDX-License-Identifier: Artistic-1.0 - -This should not be necessary, there is something weird going on here. -A number of #defines are hidden behind -DDEBUGGING that are required to build -the re extension but they are not used. Not sure why, this is a bit of a hack. - -diff --git perl-5.40.3/ext/re/Makefile.PL perl-5.40.3/ext/re/Makefile.PL -index 01786e1ec2..cc4619bfc3 100644 ---- perl-5.40.3/ext/re/Makefile.PL -+++ perl-5.40.3/ext/re/Makefile.PL -@@ -27,7 +27,7 @@ foreach my $tuple (@files) { - } - } - --my $defines = '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG -DPERL_EXT'; -+my $defines = '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG -DPERL_EXT -DDEBUGGING'; - my %args; - for my $arg (@ARGV) { - $args{$1} = $2 if $arg =~ /^(\w+)=(.*)$/; diff --git a/steps/perl-5.40.3/patches/remove-machine-generated.patch b/steps/perl-5.40.3/patches/remove-machine-generated.patch deleted file mode 100644 index fa63109e..00000000 --- a/steps/perl-5.40.3/patches/remove-machine-generated.patch +++ /dev/null @@ -1,23 +0,0 @@ -SPDX-FileCopyrightText: 2025 fosslinux - -SPDX-License-Identifier: Artistic-1.0 - -There is no way to regenerate this easily. It is merely a fallback for when the -previous fails and it will not fail with our perl. - -diff --color -ru perl-5.40.3/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm perl-5.40.3/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm ---- perl-5.40.3/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm 2025-07-23 21:56:14.121284638 +1000 -+++ perl-5.40.3/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm 2025-07-23 22:05:05.990255330 +1000 -@@ -74,13 +74,6 @@ - my $script_run_re = eval 'no warnings "experimental::script_run"; - qr/(*script_run: ^ .* $ )/x'; - my $latin_re = my_qr('[\p{IsLatin}\p{IsInherited}\p{IsCommon}]', "\x{100}"); --unless ($latin_re) { -- # This was machine generated to be the ranges of the union of the above -- # three properties, with things that were undefined by Unicode 4.1 filling -- # gaps. That is the version in use when Perl advanced enough to -- # successfully compile and execute the above pattern. -- $latin_re = my_qr('[\x00-\x{02E9}\x{02EC}-\x{0374}\x{037E}\x{0385}\x{0387}\x{0485}\x{0486}\x{0589}\x{060C}\x{061B}\x{061F}\x{0640}\x{064B}-\x{0655}\x{0670}\x{06DD}\x{0951}-\x{0954}\x{0964}\x{0965}\x{0E3F}\x{10FB}\x{16EB}-\x{16ED}\x{1735}\x{1736}\x{1802}\x{1803}\x{1805}\x{1D00}-\x{1D25}\x{1D2C}-\x{1D5C}\x{1D62}-\x{1D65}\x{1D6B}-\x{1D77}\x{1D79}-\x{1DBE}\x{1DC0}-\x{1EF9}\x{2000}-\x{2125}\x{2127}-\x{27FF}\x{2900}-\x{2B13}\x{2E00}-\x{2E1D}\x{2FF0}-\x{3004}\x{3006}\x{3008}-\x{3020}\x{302A}-\x{302D}\x{3030}-\x{3037}\x{303C}-\x{303F}\x{3099}-\x{309C}\x{30A0}\x{30FB}\x{30FC}\x{3190}-\x{319F}\x{31C0}-\x{31CF}\x{3220}-\x{325F}\x{327F}-\x{32CF}\x{3358}-\x{33FF}\x{4DC0}-\x{4DFF}\x{A700}-\x{A716}\x{FB00}-\x{FB06}\x{FD3E}\x{FD3F}\x{FE00}-\x{FE6B}\x{FEFF}-\x{FF65}\x{FF70}\x{FF9E}\x{FF9F}\x{FFE0}-\x{FFFD}\x{10100}-\x{1013F}\x{1D000}-\x{1D1DD}\x{1D300}-\x{1D7FF}]', "\x{100}"); --} - - my $every_char_is_latin_re = my_qr("^(?:$latin_re)*\\z", "A"); diff --git a/steps/perl-5.40.3/sources b/steps/perl-5.40.3/sources deleted file mode 100644 index 09051037..00000000 --- a/steps/perl-5.40.3/sources +++ /dev/null @@ -1,2 +0,0 @@ -http://www.cpan.org/src/5.0/perl-5.40.3.tar.xz 65f63b4763ab6cb9bb3d5731dd10369e1705be3c59be9847d453eb60b349ab43 -git://github.com/Perl/metaconfig~5.42.0 https://github.com/Perl/metaconfig/archive/5.42.0.tar.gz ac3948bd684a3c017a241b6fc7b899c901f814b36d030ee79887374884e30301 diff --git a/steps/perl-5.42.0/pass1.sh b/steps/perl-5.42.0/pass1.sh index 2444c823..8d133f1b 100755 --- a/steps/perl-5.42.0/pass1.sh +++ b/steps/perl-5.42.0/pass1.sh @@ -43,7 +43,9 @@ src_prepare() { perl regen/miniperlmain.pl perl regen/unicode_constants.pl perl lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p - perl -Ilib regen/mk_invlists.pl + mkdir lib_unicore + ln -s ../lib/unicore lib_unicore/ + perl -Ilib_unicore regen/mk_invlists.pl # regenerate configure mconf_dir=$(echo ../metaconfig*) diff --git a/steps/perl-5.42.0/patches/mk_invlists-remove-any.patch b/steps/perl-5.42.0/patches/mk_invlists-remove-any.patch index ebce77f2..1e7b098e 100644 --- a/steps/perl-5.42.0/patches/mk_invlists-remove-any.patch +++ b/steps/perl-5.42.0/patches/mk_invlists-remove-any.patch @@ -11,7 +11,7 @@ index 5d30ee2234..f02c07a9af 100644 @@ -1,12 +1,10 @@ #!perl -use v5.41.9; -+use v5.40.3; ++use v5.36.3; use utf8; use re "/aa"; use feature 'signatures';