commit: 621b099a57e1eea03a14672fdb7239f69dc91336
parent e9455c8463a1f0575d728cb5a2c5219407604732
Author: Andrius Štikonas <andrius@stikonas.eu>
Date: Wed, 17 Feb 2021 20:23:50 +0000
Switch to perl tarballs generated from archiving git tags.
Diffstat:
16 files changed, 144 insertions(+), 124 deletions(-)
diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
@@ -13,6 +13,6 @@ a32032bab36208509466654df12f507600dfe0313feebbcd218c32a70bf72a16 grep-2.4.tar.g
64b30b41fde2ebf669e6af489883fb1df6a06ac30555a96cfa3c39ecce7267dd make-3.80.tar.gz
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz
ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.tar.gz
-1beb92a6fc29483d0a8ab71379fb0e930a2c90198d81ba2930c1e788b5f58873 perl5.000.tar.gz
-7dd4f058d3437f7469a1ca5be77e3834e631e295bc2d4d75d6fab5a9730070fd perl5.003.tar.gz
+1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3 perl-5.000.tar.gz
+9fa29beb2fc4a3c373829fc051830796de301f32a719d0b52a400d1719bbd7b1 perl-5.003.tar.gz
c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a tar-1.12.tar.gz
diff --git a/rootfs.sh b/rootfs.sh
@@ -191,11 +191,10 @@ get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz
get_file https://ftp.gnu.org/gnu/gawk/gawk-3.0.4.tar.gz
# perl 5.000
-get_file http://mirrors.develooper.com/perl/really-ancient-perls/oldperl/dist/leo/src/perl5/perl5.000.tar.gz
+get_file https://github.com/Perl/perl5/archive/perl-5.000.tar.gz
# perl 5.003
-# Upstream tarball is a bit broken, slackware repackaged it
-get_file https://mirrors.slackware.com/slackware/slackware-3.1/source/d/perl-5.003/perl5.003.tar.gz
+get_file https://github.com/Perl/perl5/archive/perl-5.003.tar.gz
# General cleanup
find tmp -name .git -exec rm -rf \;
diff --git a/sysa/perl5.000/files/config.h b/sysa/perl-5.000/files/config.h
diff --git a/sysa/perl-5.000/files/keywords.sh b/sysa/perl-5.000/files/keywords.sh
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This file replaces keywords.pl
+
+sed -e '1,/__END__/ d' keywords.pl | sed '1d' | awk '{print "#define", "KEY_"$0, NR-1}' > keywords.h
diff --git a/sysa/perl5.000/files/opcode.awk b/sysa/perl-5.000/files/opcode.awk
diff --git a/sysa/perl-5.000/files/opcode.sh b/sysa/perl-5.000/files/opcode.sh
@@ -0,0 +1,72 @@
+#!/bin/sh -e
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This file replaces opcode.pl
+
+sed -e '1,/__END__/ d; s/[#].*$//g; /^$/d' opcode.pl | tr -s '\t' '\t' > data
+
+exec 1> opcode.h
+
+# Emit defines.
+echo "typedef enum {";
+awk '{print "\tOP_"toupper($1)","}' data
+echo " OP_max"
+echo "} opcode;"
+echo "#define MAXO " $(wc -l data | awk '{print $1}')
+
+# Emit opnames.
+printf "
+#ifndef DOINIT
+EXT char *op_name[];
+#else
+EXT char *op_name[] = {
+"
+awk -F'\t' '{print "\t\""$2"\","}' data
+printf "};
+#endif
+
+"
+
+# Emit function declarations.
+awk -F'\t' '{print "OP *\t"$3"\t_((OP* op));"}' data | sort | uniq
+awk '{print "OP *\tpp_"$1"\t_((void));"}' data
+
+# Emit ppcode switch array.
+printf "
+#ifndef DOINIT
+EXT OP * (*ppaddr[])();
+#else
+EXT OP * (*ppaddr[])() = {
+"
+awk '{print "\tpp_"$1","}' data
+printf "};
+#endif
+"
+
+# Emit check routines.
+printf "
+#ifndef DOINIT
+EXT OP * (*check[])();
+#else
+EXT OP * (*check[])() = {
+"
+awk -F'\t' '{print "\t"$3",\t/* "$1" */"}' data
+printf "};
+#endif
+"
+
+# Emit allowed argument types.
+printf "
+#ifndef DOINIT
+EXT U32 opargs[];
+#else
+EXT U32 opargs[] = {
+"
+awk -F'\t' -f opcode.awk data
+printf "};
+#endif
+"
+
+rm data
diff --git a/sysa/perl5.000/mk/main.mk b/sysa/perl-5.000/mk/main.mk
diff --git a/sysa/perl-5.000/perl-5.000.sh b/sysa/perl-5.000/perl-5.000.sh
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_unpack() {
+ default_src_unpack
+
+ mv perl5-perl-5.000 perl-5.000
+}
+
+src_prepare() {
+ default_src_prepare
+
+ # Remove and regenerate bison files
+ rm perly.c perly.h
+ bison -d perly.y
+ mv perly.tab.c perly.c
+ mv perly.tab.h perly.h
+
+ # Regenerate embed.h
+ rm embed.h
+ ./embed_h.SH
+
+ # Regenerate keywords.h
+ rm keywords.h
+ chmod +x keywords.sh
+ ./keywords.sh
+
+ # Regenerate opcode.h
+ rm opcode.h
+ chmod +x opcode.sh
+ ./opcode.sh
+}
diff --git a/sysa/perl5.003/files/config.h b/sysa/perl-5.003/files/config.h
diff --git a/sysa/perl5.003/mk/main.mk b/sysa/perl-5.003/mk/main.mk
diff --git a/sysa/perl-5.003/perl-5.003.sh b/sysa/perl-5.003/perl-5.003.sh
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_unpack() {
+ default_src_unpack
+
+ mv perl5-perl-5.003 perl-5.003
+}
+
+src_prepare() {
+ default_src_prepare
+
+ # Regenerate bison files
+ rm perly.c perly.h
+ bison -d perly.y
+ mv perly.tab.c perly.c
+ mv perly.tab.h perly.h
+
+ # Regenerate other prebuilt header files
+ for file in embed keywords opcode; do
+ rm ${file}.h
+ perl ${file}.pl
+ done
+}
diff --git a/sysa/perl5.000/files/keywords.sh b/sysa/perl5.000/files/keywords.sh
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-sed -e '1,/__END__/ d' keywords.pl | sed '1d' | awk '{print "#define", "KEY_"$0, NR-1}' > keywords.h
diff --git a/sysa/perl5.000/files/opcode.sh b/sysa/perl5.000/files/opcode.sh
@@ -1,71 +0,0 @@
-#!/bin/sh -e
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-sed -e '1,/__END__/ d; s/[#].*$//g; /^$/d' opcode.pl | tr -s '\t' '\t' > data
-
-exec 1> opcode.h
-
-# Emit defines.
-echo "typedef enum {";
-awk '{print "\tOP_"toupper($1)","}' data
-echo " OP_max"
-echo "} opcode;"
-echo "#define MAXO " $(wc -l data | awk '{print $1}')
-
-# Emit opnames.
-printf "
-#ifndef DOINIT
-EXT char *op_name[];
-#else
-EXT char *op_name[] = {
-"
-awk -F'\t' '{print "\t\""$2"\","}' data
-printf "};
-#endif
-
-"
-
-# Emit function declarations.
-awk -F'\t' '{print "OP *\t"$3"\t_((OP* op));"}' data | sort | uniq
-awk '{print "OP *\tpp_"$1"\t_((void));"}' data
-
-# Emit ppcode switch array.
-printf "
-#ifndef DOINIT
-EXT OP * (*ppaddr[])();
-#else
-EXT OP * (*ppaddr[])() = {
-"
-awk '{print "\tpp_"$1","}' data
-printf "};
-#endif
-"
-
-# Emit check routines.
-printf "
-#ifndef DOINIT
-EXT OP * (*check[])();
-#else
-EXT OP * (*check[])() = {
-"
-awk -F'\t' '{print "\t"$3",\t/* "$1" */"}' data
-printf "};
-#endif
-"
-
-# Emit allowed argument types.
-printf "
-#ifndef DOINIT
-EXT U32 opargs[];
-#else
-EXT U32 opargs[] = {
-"
-awk -F'\t' -f opcode.awk data
-printf "};
-#endif
-"
-
-rm data
diff --git a/sysa/perl5.000/perl5.000.sh b/sysa/perl5.000/perl5.000.sh
@@ -1,23 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
- default_src_prepare
-
- rm perly.c perly.h
- bison -d perly.y
- mv perly.tab.c perly.c
- mv perly.tab.h perly.h
-
- rm embed.h
- ./embed_h.SH
-
- rm keywords.h
- chmod +x keywords.sh
- ./keywords.sh
-
- rm opcode.h
- chmod +x opcode.sh
- ./opcode.sh
-}
diff --git a/sysa/perl5.003/perl5.003.sh b/sysa/perl5.003/perl5.003.sh
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
- default_src_prepare
-
- rm perly.c perly.h
- bison -d perly.y
- mv perly.tab.c perly.c
- mv perly.tab.h perly.h
-
- for file in embed keywords opcode; do
- rm ${file}.h
- perl ${file}.pl
- done
-}
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -42,9 +42,9 @@ build coreutils-5.0
build gawk-3.0.4
# Part 29
-build perl5.000
+build perl-5.000
# Part 30
-build perl5.003
+build perl-5.003
echo "Bootstrapping completed."
