Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[preview] Pull Request to bump blead to 7.1.0 #181

Open
wants to merge 5 commits into
base: blead
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Configure
Original file line number Diff line number Diff line change
Expand Up @@ -1901,7 +1901,7 @@ fi
touch posthint.sh

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

: See if we are using a devel version and want that
xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
xversion=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h`
case "$usedevel" in
$define|true|[yY]*)
usedevel="$define" ;;
Expand Down Expand Up @@ -4339,9 +4339,9 @@ esac'
echo " "
echo "Getting the current patchlevel..." >&4
if $test -r $rsrc/patchlevel.h;then
revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $rsrc/patchlevel.h`
patchlevel=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
revision=`awk '/define[ ]+PERL_VERSION_MAJOR/ {print $3}' $rsrc/patchlevel.h`
patchlevel=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h`
subversion=`awk '/define[ ]+PERL_VERSION_PATCH/ {print $3}' $rsrc/patchlevel.h`
api_revision=`awk '/define[ ]+PERL_API_REVISION/ {print $3}' $rsrc/patchlevel.h`
api_version=`awk '/define[ ]+PERL_API_VERSION/ {print $3}' $rsrc/patchlevel.h`
api_subversion=`awk '/define[ ]+PERL_API_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
Expand Down Expand Up @@ -9637,7 +9637,7 @@ case "$usecbacktrace" in
: Check if faststdio is requested and available
case "$usefaststdio" in
$define|true|[yY]*|'')
xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
xversion=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h`
case "$xversion" in
[68]) dflt='y' ;;
*) dflt='n' ;;
Expand Down
50 changes: 25 additions & 25 deletions Cross/config.sh-arm-linux
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ afsroot='/afs'
alignbytes='4'
aphostname='/bin/hostname'
api_revision='5'
api_subversion='1'
api_version='33'
api_versionstring='5.33.1'
api_subversion='0'
api_version='1'
api_versionstring='7.1.0'
ar='ar'
archlib='/usr/lib/perl5/5.33.1/armv4l-linux'
archlibexp='/usr/lib/perl5/5.33.1/armv4l-linux'
archlib='/usr/lib/perl/7.1.0/armv4l-linux'
archlibexp='/usr/lib/perl/7.1.0/armv4l-linux'
archname64=''
archname='armv4l-linux'
archobjs=''
Expand All @@ -55,7 +55,7 @@ castflags='0'
cat='cat'
cc='cc'
cccdlflags='-fpic'
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.33.1/armv4l-linux/CORE'
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl/7.1.0/armv4l-linux/CORE'
ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccname='arm-linux-gcc'
Expand Down Expand Up @@ -824,21 +824,21 @@ inc_version_list=' '
inc_version_list_init='0'
incpath=''
inews=''
installarchlib='./install_me_here/usr/lib/perl5/5.33.1/armv4l-linux'
installarchlib='./install_me_here/usr/lib/perl/7.1.0/armv4l-linux'
installbin='./install_me_here/usr/bin'
installhtml1dir=''
installhtml3dir=''
installman1dir='./install_me_here/usr/share/man/man1'
installman3dir='./install_me_here/usr/share/man/man3'
installprefix='./install_me_here/usr'
installprefixexp='./install_me_here/usr'
installprivlib='./install_me_here/usr/lib/perl5/5.33.1'
installprivlib='./install_me_here/usr/lib/perl/7.1.0'
installscript='./install_me_here/usr/bin'
installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
installsitearch='./install_me_here/usr/lib/perl/site_perl/7.1.0/armv4l-linux'
installsitebin='./install_me_here/usr/bin'
installsitehtml1dir=''
installsitehtml3dir=''
installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.33.1'
installsitelib='./install_me_here/usr/lib/perl/site_perl/7.1.0'
installsiteman1dir='./install_me_here/usr/share/man/man1'
installsiteman3dir='./install_me_here/usr/share/man/man3'
installsitescript='./install_me_here/usr/bin'
Expand Down Expand Up @@ -952,7 +952,7 @@ orderlib='false'
osname='linux'
osvers='2.4.6-rmk1-np2-embedix'
otherlibdirs=' '
package='perl5'
package='perl7'
pager='/usr/bin/less'
passcat='cat /etc/passwd'
patchlevel='9'
Expand All @@ -972,8 +972,8 @@ pmake=''
pr=''
prefix='/usr'
prefixexp='/usr'
privlib='/usr/lib/perl5/5.33.1'
privlibexp='/usr/lib/perl5/5.33.1'
privlib='/usr/lib/perl/7.1.0'
privlibexp='/usr/lib/perl/7.1.0'
procselfexe='"/proc/self/exe"'
prototype='define'
ptrsize='4'
Expand Down Expand Up @@ -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
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'
sig_size='68'
signal_t='void'
sitearch='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
sitearchexp='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
sitearch='/usr/lib/perl/site_perl/7.1.0/armv4l-linux'
sitearchexp='/usr/lib/perl/site_perl/7.1.0/armv4l-linux'
sitebin='/usr/bin'
sitebinexp='/usr/bin'
sitehtml1dir=''
sitehtml1direxp=''
sitehtml3dir=''
sitehtml3direxp=''
sitelib='/usr/lib/perl5/site_perl/5.33.1'
sitelib='/usr/lib/perl/site_perl/7.1.0'
sitelib_stem='/usr/lib/perl5/site_perl'
sitelibexp='/usr/lib/perl5/site_perl/5.33.1'
sitelibexp='/usr/lib/perl/site_perl/7.1.0'
siteman1dir='/usr/share/man/man1'
siteman1direxp='/usr/share/man/man1'
siteman3dir='/usr/share/man/man3'
Expand Down Expand Up @@ -1178,8 +1178,8 @@ vendorprefix=''
vendorprefixexp=''
vendorscript=''
vendorscriptexp=''
version='5.33.1'
version_patchlevel_string='version 33 subversion 1'
version='7.1.0'
version_patchlevel_string='version 1 subversion 0'
versiononly='undef'
vi=''
xlibpth='/usr/lib/386 /lib/386'
Expand All @@ -1191,11 +1191,11 @@ zip='zip'
config_arg0='Configure'
config_args=''
config_argc=0
PERL_REVISION=5
PERL_VERSION=33
PERL_SUBVERSION=1
PERL_API_REVISION=5
PERL_API_VERSION=33
PERL_API_SUBVERSION=1
PERL_VERSION_MAJOR=7
PERL_VERSION_MINOR=1
PERL_VERSION_PATCH=0
PERL_API_REVISION=7
PERL_API_VERSION=1
PERL_API_SUBVERSION=0
PERL_PATCHLEVEL=
PERL_CONFIG_SH=true
50 changes: 25 additions & 25 deletions Cross/config.sh-arm-linux-n770
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ afsroot='/afs'
alignbytes='4'
aphostname='/bin/hostname'
api_revision='5'
api_subversion='1'
api_version='33'
api_versionstring='5.33.1'
api_subversion='0'
api_version='1'
api_versionstring='7.1.0'
ar='ar'
archlib='/usr/lib/perl5/5.33.1/armv4l-linux'
archlibexp='/usr/lib/perl5/5.33.1/armv4l-linux'
archlib='/usr/lib/perl/7.1.0/armv4l-linux'
archlibexp='/usr/lib/perl/7.1.0/armv4l-linux'
archname64=''
archname='armv4l-linux'
archobjs=''
Expand All @@ -54,7 +54,7 @@ castflags='0'
cat='cat'
cc='arm-none-linux-gnueabi-gcc'
cccdlflags='-fpic'
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.33.1/armv4l-linux/CORE'
ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl/7.1.0/armv4l-linux/CORE'
ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccname='arm-linux-gcc'
Expand Down Expand Up @@ -822,21 +822,21 @@ inc_version_list=' '
inc_version_list_init='0'
incpath=''
inews=''
installarchlib='./install_me_here/usr/lib/perl5/5.33.1/armv4l-linux'
installarchlib='./install_me_here/usr/lib/perl/7.1.0/armv4l-linux'
installbin='./install_me_here/usr/bin'
installhtml1dir=''
installhtml3dir=''
installman1dir='./install_me_here/usr/share/man/man1'
installman3dir='./install_me_here/usr/share/man/man3'
installprefix='./install_me_here/usr'
installprefixexp='./install_me_here/usr'
installprivlib='./install_me_here/usr/lib/perl5/5.33.1'
installprivlib='./install_me_here/usr/lib/perl/7.1.0'
installscript='./install_me_here/usr/bin'
installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
installsitearch='./install_me_here/usr/lib/perl/site_perl/7.1.0/armv4l-linux'
installsitebin='./install_me_here/usr/bin'
installsitehtml1dir=''
installsitehtml3dir=''
installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.33.1'
installsitelib='./install_me_here/usr/lib/perl/site_perl/7.1.0'
installsiteman1dir='./install_me_here/usr/share/man/man1'
installsiteman3dir='./install_me_here/usr/share/man/man3'
installsitescript='./install_me_here/usr/bin'
Expand Down Expand Up @@ -950,7 +950,7 @@ orderlib='false'
osname='linux'
osvers='2.6'
otherlibdirs=' '
package='perl5'
package='perl7'
pager='/usr/bin/less'
passcat='cat /etc/passwd'
patchlevel='11'
Expand All @@ -970,8 +970,8 @@ pmake=''
pr=''
prefix='/usr'
prefixexp='/usr'
privlib='/usr/lib/perl5/5.33.1'
privlibexp='/usr/lib/perl5/5.33.1'
privlib='/usr/lib/perl/7.1.0'
privlibexp='/usr/lib/perl/7.1.0'
procselfexe='"/proc/self/exe"'
prototype='define'
ptrsize='4'
Expand Down Expand Up @@ -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
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'
sig_size='68'
signal_t='void'
sitearch='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
sitearchexp='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux'
sitearch='/usr/lib/perl/site_perl/7.1.0/armv4l-linux'
sitearchexp='/usr/lib/perl/site_perl/7.1.0/armv4l-linux'
sitebin='/usr/bin'
sitebinexp='/usr/bin'
sitehtml1dir=''
sitehtml1direxp=''
sitehtml3dir=''
sitehtml3direxp=''
sitelib='/usr/lib/perl5/site_perl/5.33.1'
sitelib='/usr/lib/perl/site_perl/7.1.0'
sitelib_stem='/usr/lib/perl5/site_perl'
sitelibexp='/usr/lib/perl5/site_perl/5.33.1'
sitelibexp='/usr/lib/perl/site_perl/7.1.0'
siteman1dir='/usr/share/man/man1'
siteman1direxp='/usr/share/man/man1'
siteman3dir='/usr/share/man/man3'
Expand Down Expand Up @@ -1176,8 +1176,8 @@ vendorprefix=''
vendorprefixexp=''
vendorscript=''
vendorscriptexp=''
version='5.33.1'
version_patchlevel_string='version 33 subversion 1'
version='7.1.0'
version_patchlevel_string='version 1 subversion 0'
versiononly='undef'
vi=''
xlibpth='/usr/lib/386 /lib/386'
Expand All @@ -1189,11 +1189,11 @@ zip='zip'
config_arg0='Configure'
config_args=''
config_argc=0
PERL_REVISION=5
PERL_VERSION=33
PERL_SUBVERSION=1
PERL_API_REVISION=5
PERL_API_VERSION=33
PERL_API_SUBVERSION=1
PERL_VERSION_MAJOR=7
PERL_VERSION_MINOR=1
PERL_VERSION_PATCH=0
PERL_API_REVISION=7
PERL_API_VERSION=1
PERL_API_SUBVERSION=0
PERL_PATCHLEVEL=
PERL_CONFIG_SH=true
28 changes: 14 additions & 14 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ The directories set up by Configure fall into three broad categories.

=item Directories for the perl distribution

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

=head1 Coexistence with earlier versions of perl 5

Perl 5.33.1 is not binary compatible with earlier versions of Perl.
Perl 7.1.0 is not binary compatible with earlier versions of Perl.
In other words, you will have to recompile your XS modules.

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

sh Configure -Dprefix=/opt/perl5.33.1
sh Configure -Dprefix=/opt/perl7.1.0

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

Expand All @@ -2530,11 +2530,11 @@ yet.

=head2 Upgrading from 5.32.0 or earlier

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

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

in Linux with perl-5.33.1 is as follows (under $Config{prefix}):
in Linux with perl-7.1.0 is as follows (under $Config{prefix}):

./bin/perl
./lib/perl5/5.33.1/strict.pm
./lib/perl5/5.33.1/warnings.pm
./lib/perl5/5.33.1/i686-linux/File/Glob.pm
./lib/perl5/5.33.1/feature.pm
./lib/perl5/5.33.1/XSLoader.pm
./lib/perl5/5.33.1/i686-linux/auto/File/Glob/Glob.so
./lib/perl/7.1.0/strict.pm
./lib/perl/7.1.0/warnings.pm
./lib/perl/7.1.0/i686-linux/File/Glob.pm
./lib/perl/7.1.0/feature.pm
./lib/perl/7.1.0/XSLoader.pm
./lib/perl/7.1.0/i686-linux/auto/File/Glob/Glob.so

Secondly, for perl-5.10.1, the Debian perl-base package contains 591
files, (of which 510 are for lib/unicore) totaling about 3.5MB in its
Expand Down
2 changes: 1 addition & 1 deletion META.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@
"url" : "https://github.com/Perl/perl5"
}
},
"version" : "5.033001",
"version" : "7.001000",
"x_serialization_backend" : "JSON::PP version 4.05"
}
2 changes: 1 addition & 1 deletion META.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,5 @@ resources:
homepage: https://www.perl.org/
license: https://dev.perl.org/licenses/
repository: https://github.com/Perl/perl5
version: '5.033001'
version: '7.001000'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
8 changes: 4 additions & 4 deletions Makefile.SH
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ esac

$spitshell >>$Makefile <<'!NO!SUBS!'

perltoc_pod_prereqs = extra.pods pod/perl5331delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
perltoc_pod_prereqs = extra.pods pod/perl710delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
generated_headers = uudmap.h bitcount.h mg_data.h

Expand Down Expand Up @@ -1153,9 +1153,9 @@ pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
$(MINIPERL) pod/perlmodlib.PL -q

pod/perl5331delta.pod: pod/perldelta.pod
$(RMS) pod/perl5331delta.pod
$(LNS) perldelta.pod pod/perl5331delta.pod
pod/perl710delta.pod: pod/perldelta.pod
$(RMS) pod/perl710delta.pod
$(LNS) perldelta.pod pod/perl710delta.pod

extra.pods: $(MINIPERL_EXE)
-@test ! -f extra.pods || rm -f `cat extra.pods`
Expand Down
Loading