Skip to content

Commit 2416891

Browse files
atoomicatoomic
committed
Update Perl version to 7.0.0
To provide backward compatibility with XS code PERL_REVISION, PERL_VERSION and PERL_SUBVERSION are frozen at 5.255.255 - view patchlevel.h This is introducing new Perl semantic versioning macros: PERL_VERSION_MAJOR, PERL_VERSION_MINOR, PERL_VERSION_PATCH It's recommended to use the compare functions PERL_VERSION_EQ, PERL_VERSION_LT... instead of a direct access to the `VERSION` macros.
1 parent 8a0e31d commit 2416891

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+672
-579
lines changed

‎Configure

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ fi
19011901
touch posthint.sh
19021902

19031903
: set package name
1904-
package='perl5'
1904+
package='perl7'
19051905
first=`echo $package | sed -e 's/^\(.\).*/\1/'`
19061906
last=`echo $package | sed -e 's/^.\(.*\)/\1/'`
19071907
case "`echo AbyZ | tr '[:lower:]' '[:upper:]' 2>/dev/null`"-"`echo AbyZ | tr '[:upper:]' '[:lower:]' 2>/dev/null`" in
@@ -2290,7 +2290,7 @@ You may safely delete it if you wish.
22902290
EOF
22912291

22922292
: See if we are using a devel version and want that
2293-
xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
2293+
xversion=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h`
22942294
case "$usedevel" in
22952295
$define|true|[yY]*)
22962296
usedevel="$define" ;;
@@ -4339,9 +4339,9 @@ esac'
43394339
echo " "
43404340
echo "Getting the current patchlevel..." >&4
43414341
if $test -r $rsrc/patchlevel.h;then
4342-
revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $rsrc/patchlevel.h`
4343-
patchlevel=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
4344-
subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
4342+
revision=`awk '/define[ ]+PERL_VERSION_MAJOR/ {print $3}' $rsrc/patchlevel.h`
4343+
patchlevel=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h`
4344+
subversion=`awk '/define[ ]+PERL_VERSION_PATCH/ {print $3}' $rsrc/patchlevel.h`
43454345
api_revision=`awk '/define[ ]+PERL_API_REVISION/ {print $3}' $rsrc/patchlevel.h`
43464346
api_version=`awk '/define[ ]+PERL_API_VERSION/ {print $3}' $rsrc/patchlevel.h`
43474347
api_subversion=`awk '/define[ ]+PERL_API_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
@@ -9637,7 +9637,7 @@ case "$usecbacktrace" in
96379637
: Check if faststdio is requested and available
96389638
case "$usefaststdio" in
96399639
$define|true|[yY]*|'')
9640-
xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
9640+
xversion=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h`
96419641
case "$xversion" in
96429642
[68]) dflt='y' ;;
96439643
*) dflt='n' ;;

‎Cross/config.sh-arm-linux

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ afsroot='/afs'
3131
alignbytes='4'
3232
aphostname='/bin/hostname'
3333
api_revision='5'
34-
api_subversion='1'
35-
api_version='33'
36-
api_versionstring='5.33.1'
34+
api_subversion='0'
35+
api_version='0'
36+
api_versionstring='7.0.0'
3737
ar='ar'
38-
archlib='/usr/lib/perl5/5.33.1/armv4l-linux'
39-
archlibexp='/usr/lib/perl5/5.33.1/armv4l-linux'
38+
archlib='/usr/lib/perl/7.0.0/armv4l-linux'
39+
archlibexp='/usr/lib/perl/7.0.0/armv4l-linux'
4040
archname64=''
4141
archname='armv4l-linux'
4242
archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
5555
cat='cat'
5656
cc='cc'
5757
cccdlflags='-fpic'
58-
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.33.1/armv4l-linux/CORE'
58+
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl/7.0.0/armv4l-linux/CORE'
5959
ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
6060
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
6161
ccname='arm-linux-gcc'
@@ -824,21 +824,21 @@ inc_version_list=' '
824824
inc_version_list_init='0'
825825
incpath=''
826826
inews=''
827-
installarchlib='./install_me_here/usr/lib/perl5/5.33.1/armv4l-linux'
827+
installarchlib='./install_me_here/usr/lib/perl/7.0.0/armv4l-linux'
828828
installbin='./install_me_here/usr/bin'
829829
installhtml1dir=''
830830
installhtml3dir=''
831831
installman1dir='./install_me_here/usr/share/man/man1'
832832
installman3dir='./install_me_here/usr/share/man/man3'
833833
installprefix='./install_me_here/usr'
834834
installprefixexp='./install_me_here/usr'
835-
installprivlib='./install_me_here/usr/lib/perl5/5.33.1'
835+
installprivlib='./install_me_here/usr/lib/perl/7.0.0'
836836
installscript='./install_me_here/usr/bin'
837-
installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
837+
installsitearch='./install_me_here/usr/lib/perl/site_perl/7.0.0/armv4l-linux'
838838
installsitebin='./install_me_here/usr/bin'
839839
installsitehtml1dir=''
840840
installsitehtml3dir=''
841-
installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.33.1'
841+
installsitelib='./install_me_here/usr/lib/perl/site_perl/7.0.0'
842842
installsiteman1dir='./install_me_here/usr/share/man/man1'
843843
installsiteman3dir='./install_me_here/usr/share/man/man3'
844844
installsitescript='./install_me_here/usr/bin'
@@ -952,7 +952,7 @@ orderlib='false'
952952
osname='linux'
953953
osvers='2.4.6-rmk1-np2-embedix'
954954
otherlibdirs=' '
955-
package='perl5'
955+
package='perl7'
956956
pager='/usr/bin/less'
957957
passcat='cat /etc/passwd'
958958
patchlevel='9'
@@ -972,8 +972,8 @@ pmake=''
972972
pr=''
973973
prefix='/usr'
974974
prefixexp='/usr'
975-
privlib='/usr/lib/perl5/5.33.1'
976-
privlibexp='/usr/lib/perl5/5.33.1'
975+
privlib='/usr/lib/perl/7.0.0'
976+
privlibexp='/usr/lib/perl/7.0.0'
977977
procselfexe='"/proc/self/exe"'
978978
prototype='define'
979979
ptrsize='4'
@@ -1038,17 +1038,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
10381038
sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
10391039
sig_size='68'
10401040
signal_t='void'
1041-
sitearch='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
1042-
sitearchexp='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
1041+
sitearch='/usr/lib/perl/site_perl/7.0.0/armv4l-linux'
1042+
sitearchexp='/usr/lib/perl/site_perl/7.0.0/armv4l-linux'
10431043
sitebin='/usr/bin'
10441044
sitebinexp='/usr/bin'
10451045
sitehtml1dir=''
10461046
sitehtml1direxp=''
10471047
sitehtml3dir=''
10481048
sitehtml3direxp=''
1049-
sitelib='/usr/lib/perl5/site_perl/5.33.1'
1049+
sitelib='/usr/lib/perl/site_perl/7.0.0'
10501050
sitelib_stem='/usr/lib/perl5/site_perl'
1051-
sitelibexp='/usr/lib/perl5/site_perl/5.33.1'
1051+
sitelibexp='/usr/lib/perl/site_perl/7.0.0'
10521052
siteman1dir='/usr/share/man/man1'
10531053
siteman1direxp='/usr/share/man/man1'
10541054
siteman3dir='/usr/share/man/man3'
@@ -1087,7 +1087,7 @@ stdio_stream_array=''
10871087
strerror_r_proto='0'
10881088
strings='/usr/include/string.h'
10891089
submit=''
1090-
subversion='1'
1090+
subversion='0'
10911091
sysman='/usr/share/man/man1'
10921092
tail=''
10931093
tar=''
@@ -1178,8 +1178,8 @@ vendorprefix=''
11781178
vendorprefixexp=''
11791179
vendorscript=''
11801180
vendorscriptexp=''
1181-
version='5.33.1'
1182-
version_patchlevel_string='version 33 subversion 1'
1181+
version='7.0.0'
1182+
version_patchlevel_string='version 0 subversion 0'
11831183
versiononly='undef'
11841184
vi=''
11851185
xlibpth='/usr/lib/386 /lib/386'
@@ -1191,11 +1191,11 @@ zip='zip'
11911191
config_arg0='Configure'
11921192
config_args=''
11931193
config_argc=0
1194-
PERL_REVISION=5
1195-
PERL_VERSION=33
1196-
PERL_SUBVERSION=1
1197-
PERL_API_REVISION=5
1198-
PERL_API_VERSION=33
1199-
PERL_API_SUBVERSION=1
1194+
PERL_VERSION_MAJOR=7
1195+
PERL_VERSION_MINOR=0
1196+
PERL_VERSION_PATCH=0
1197+
PERL_API_REVISION=7
1198+
PERL_API_VERSION=0
1199+
PERL_API_SUBVERSION=0
12001200
PERL_PATCHLEVEL=
12011201
PERL_CONFIG_SH=true

‎Cross/config.sh-arm-linux-n770

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ afsroot='/afs'
3131
alignbytes='4'
3232
aphostname='/bin/hostname'
3333
api_revision='5'
34-
api_subversion='1'
35-
api_version='33'
36-
api_versionstring='5.33.1'
34+
api_subversion='0'
35+
api_version='0'
36+
api_versionstring='7.0.0'
3737
ar='ar'
38-
archlib='/usr/lib/perl5/5.33.1/armv4l-linux'
39-
archlibexp='/usr/lib/perl5/5.33.1/armv4l-linux'
38+
archlib='/usr/lib/perl/7.0.0/armv4l-linux'
39+
archlibexp='/usr/lib/perl/7.0.0/armv4l-linux'
4040
archname64=''
4141
archname='armv4l-linux'
4242
archobjs=''
@@ -54,7 +54,7 @@ castflags='0'
5454
cat='cat'
5555
cc='arm-none-linux-gnueabi-gcc'
5656
cccdlflags='-fpic'
57-
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.33.1/armv4l-linux/CORE'
57+
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl/7.0.0/armv4l-linux/CORE'
5858
ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
5959
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
6060
ccname='arm-linux-gcc'
@@ -822,21 +822,21 @@ inc_version_list=' '
822822
inc_version_list_init='0'
823823
incpath=''
824824
inews=''
825-
installarchlib='./install_me_here/usr/lib/perl5/5.33.1/armv4l-linux'
825+
installarchlib='./install_me_here/usr/lib/perl/7.0.0/armv4l-linux'
826826
installbin='./install_me_here/usr/bin'
827827
installhtml1dir=''
828828
installhtml3dir=''
829829
installman1dir='./install_me_here/usr/share/man/man1'
830830
installman3dir='./install_me_here/usr/share/man/man3'
831831
installprefix='./install_me_here/usr'
832832
installprefixexp='./install_me_here/usr'
833-
installprivlib='./install_me_here/usr/lib/perl5/5.33.1'
833+
installprivlib='./install_me_here/usr/lib/perl/7.0.0'
834834
installscript='./install_me_here/usr/bin'
835-
installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
835+
installsitearch='./install_me_here/usr/lib/perl/site_perl/7.0.0/armv4l-linux'
836836
installsitebin='./install_me_here/usr/bin'
837837
installsitehtml1dir=''
838838
installsitehtml3dir=''
839-
installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.33.1'
839+
installsitelib='./install_me_here/usr/lib/perl/site_perl/7.0.0'
840840
installsiteman1dir='./install_me_here/usr/share/man/man1'
841841
installsiteman3dir='./install_me_here/usr/share/man/man3'
842842
installsitescript='./install_me_here/usr/bin'
@@ -950,7 +950,7 @@ orderlib='false'
950950
osname='linux'
951951
osvers='2.6'
952952
otherlibdirs=' '
953-
package='perl5'
953+
package='perl7'
954954
pager='/usr/bin/less'
955955
passcat='cat /etc/passwd'
956956
patchlevel='11'
@@ -970,8 +970,8 @@ pmake=''
970970
pr=''
971971
prefix='/usr'
972972
prefixexp='/usr'
973-
privlib='/usr/lib/perl5/5.33.1'
974-
privlibexp='/usr/lib/perl5/5.33.1'
973+
privlib='/usr/lib/perl/7.0.0'
974+
privlibexp='/usr/lib/perl/7.0.0'
975975
procselfexe='"/proc/self/exe"'
976976
prototype='define'
977977
ptrsize='4'
@@ -1036,17 +1036,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
10361036
sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
10371037
sig_size='68'
10381038
signal_t='void'
1039-
sitearch='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
1040-
sitearchexp='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
1039+
sitearch='/usr/lib/perl/site_perl/7.0.0/armv4l-linux'
1040+
sitearchexp='/usr/lib/perl/site_perl/7.0.0/armv4l-linux'
10411041
sitebin='/usr/bin'
10421042
sitebinexp='/usr/bin'
10431043
sitehtml1dir=''
10441044
sitehtml1direxp=''
10451045
sitehtml3dir=''
10461046
sitehtml3direxp=''
1047-
sitelib='/usr/lib/perl5/site_perl/5.33.1'
1047+
sitelib='/usr/lib/perl/site_perl/7.0.0'
10481048
sitelib_stem='/usr/lib/perl5/site_perl'
1049-
sitelibexp='/usr/lib/perl5/site_perl/5.33.1'
1049+
sitelibexp='/usr/lib/perl/site_perl/7.0.0'
10501050
siteman1dir='/usr/share/man/man1'
10511051
siteman1direxp='/usr/share/man/man1'
10521052
siteman3dir='/usr/share/man/man3'
@@ -1085,7 +1085,7 @@ stdio_stream_array=''
10851085
strerror_r_proto='0'
10861086
strings='/usr/include/string.h'
10871087
submit=''
1088-
subversion='1'
1088+
subversion='0'
10891089
sysman='/usr/share/man/man1'
10901090
tail=''
10911091
tar=''
@@ -1176,8 +1176,8 @@ vendorprefix=''
11761176
vendorprefixexp=''
11771177
vendorscript=''
11781178
vendorscriptexp=''
1179-
version='5.33.1'
1180-
version_patchlevel_string='version 33 subversion 1'
1179+
version='7.0.0'
1180+
version_patchlevel_string='version 0 subversion 0'
11811181
versiononly='undef'
11821182
vi=''
11831183
xlibpth='/usr/lib/386 /lib/386'
@@ -1189,11 +1189,11 @@ zip='zip'
11891189
config_arg0='Configure'
11901190
config_args=''
11911191
config_argc=0
1192-
PERL_REVISION=5
1193-
PERL_VERSION=33
1194-
PERL_SUBVERSION=1
1195-
PERL_API_REVISION=5
1196-
PERL_API_VERSION=33
1197-
PERL_API_SUBVERSION=1
1192+
PERL_VERSION_MAJOR=7
1193+
PERL_VERSION_MINOR=0
1194+
PERL_VERSION_PATCH=0
1195+
PERL_API_REVISION=7
1196+
PERL_API_VERSION=0
1197+
PERL_API_SUBVERSION=0
11981198
PERL_PATCHLEVEL=
11991199
PERL_CONFIG_SH=true

‎INSTALL

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ The directories set up by Configure fall into three broad categories.
615615

616616
=item Directories for the perl distribution
617617

618-
By default, Configure will use the following directories for 5.33.1.
618+
By default, Configure will use the following directories for 7.0.0.
619619
$version is the full perl version number, including subversion, e.g.
620620
5.12.3, and $archname is a string like sun4-sunos,
621621
determined by Configure. The full definitions of all Configure
@@ -2438,7 +2438,7 @@ L<https://www.chiark.greenend.org.uk/~sgtatham/bugs.html>
24382438

24392439
=head1 Coexistence with earlier versions of perl 5
24402440

2441-
Perl 5.33.1 is not binary compatible with earlier versions of Perl.
2441+
Perl 7.0.0 is not binary compatible with earlier versions of Perl.
24422442
In other words, you will have to recompile your XS modules.
24432443

24442444
In general, you can usually safely upgrade from one stable version of Perl
@@ -2513,9 +2513,9 @@ won't interfere with another version. (The defaults guarantee this for
25132513
libraries after 5.6.0, but not for executables. TODO?) One convenient
25142514
way to do this is by using a separate prefix for each version, such as
25152515

2516-
sh Configure -Dprefix=/opt/perl5.33.1
2516+
sh Configure -Dprefix=/opt/perl7.0.0
25172517

2518-
and adding /opt/perl5.33.1/bin to the shell PATH variable. Such users
2518+
and adding /opt/perl7.0.0/bin to the shell PATH variable. Such users
25192519
may also wish to add a symbolic link /usr/local/bin/perl so that
25202520
scripts can still start with #!/usr/local/bin/perl.
25212521

@@ -2530,11 +2530,11 @@ yet.
25302530

25312531
=head2 Upgrading from 5.32.0 or earlier
25322532

2533-
B<Perl 5.33.1 may not be binary compatible with Perl 5.32.0 or
2533+
B<Perl 7.0.0 may not be binary compatible with Perl 5.32.0 or
25342534
earlier Perl releases.> Perl modules having binary parts
25352535
(meaning that a C compiler is used) will have to be recompiled to be
2536-
used with 5.33.1. If you find you do need to rebuild an extension with
2537-
5.33.1, you may safely do so without disturbing the older
2536+
used with 7.0.0. If you find you do need to rebuild an extension with
2537+
7.0.0, you may safely do so without disturbing the older
25382538
installations. (See L<"Coexistence with earlier versions of perl 5">
25392539
above.)
25402540

@@ -2567,15 +2567,15 @@ Firstly, the bare minimum to run this script
25672567
print("$f\n");
25682568
}
25692569

2570-
in Linux with perl-5.33.1 is as follows (under $Config{prefix}):
2570+
in Linux with perl-7.0.0 is as follows (under $Config{prefix}):
25712571

25722572
./bin/perl
2573-
./lib/perl5/5.33.1/strict.pm
2574-
./lib/perl5/5.33.1/warnings.pm
2575-
./lib/perl5/5.33.1/i686-linux/File/Glob.pm
2576-
./lib/perl5/5.33.1/feature.pm
2577-
./lib/perl5/5.33.1/XSLoader.pm
2578-
./lib/perl5/5.33.1/i686-linux/auto/File/Glob/Glob.so
2573+
./lib/perl/7.0.0/strict.pm
2574+
./lib/perl/7.0.0/warnings.pm
2575+
./lib/perl/7.0.0/i686-linux/File/Glob.pm
2576+
./lib/perl/7.0.0/feature.pm
2577+
./lib/perl/7.0.0/XSLoader.pm
2578+
./lib/perl/7.0.0/i686-linux/auto/File/Glob/Glob.so
25792579

25802580
Secondly, for perl-5.10.1, the Debian perl-base package contains 591
25812581
files, (of which 510 are for lib/unicore) totaling about 3.5MB in its

‎META.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,6 @@
130130
"url" : "https://github.com/Perl/perl5"
131131
}
132132
},
133-
"version" : "5.033001",
133+
"version" : "7.000000",
134134
"x_serialization_backend" : "JSON::PP version 4.05"
135135
}

‎META.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,5 @@ resources:
117117
homepage: https://www.perl.org/
118118
license: https://dev.perl.org/licenses/
119119
repository: https://github.com/Perl/perl5
120-
version: '5.033001'
120+
version: '7.000000'
121121
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

0 commit comments

Comments
 (0)