Skip to content

Commit 32a3bbb

Browse files
committed
Updated for Perl v5.28.1
1 parent ad53548 commit 32a3bbb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

build/build.pl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,18 @@ =head1 Author, Copyright, and License
120120
}
121121
GITSTUFF: {
122122
my $d = pushd($C{PERLSRCDIR});
123+
my $remhead;
123124
eval {
124125
git 'fetch';
126+
$remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
125127
1 } or do {
126128
warn $@;
127129
# Maybe we don't have network connectivity
128-
if (prompt("Whoops, 'git fetch' failed. Continue anyway? [Yn]","y")=~/^\s*y/i)
130+
if (prompt("Whoops, 'git' failed. Continue anyway? [Yn]","y")=~/^\s*y/i)
129131
{ last GITSTUFF }
130132
else { die "git fetch failed, aborting" }
131133
};
132134
my $myhead = git 'log', '-1', '--format=%h', $C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
133-
my $remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
134135
say STDERR "# Local branch is at $myhead, remote is $remhead";
135136
if ($myhead ne $remhead) {
136137
git 'merge-base', '--is-ancestor', $remhead, $myhead, {allow_exit=>[0,1]};
@@ -372,7 +373,7 @@ sub verify_hostperl {
372373
safelink( $C{PERLSRCDIR}->file('ext','WebPerl','t','WebPerl.t'),
373374
$destdir->file('dev','WebPerl.t') );
374375
safelink( $C{PERLSRCDIR}->file('ext','WebPerl','lib','WebPerl.pm'),
375-
$destdir->file('lib','5.28.0','wasm','WebPerl.pm') ); #TODO: should figure this directory out dynamically
376+
$destdir->file('lib',$C{PERLVER}=~s/^v(?=5)//r,'wasm','WebPerl.pm') );
376377

377378
#TODO Later: Provide an easy way for users to add files to the virtual file system
378379

build/emperl_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export EMPERL_OUTPUTDIR="$BASEDIR/work/outputperl"
2727

2828
# Don't edit the following options unless you know what you're doing!
2929
# Note to self: In build.pl, we take advantage of the fact that on Perls >=v5.10.0, "$^V" is the same as the tag name.
30-
export EMPERL_PERLVER="v5.28.0"
30+
export EMPERL_PERLVER="v5.28.1"
3131
export EMPERL_PREFIX="/opt/perl"
3232
# Note: strace shows this is how file_packager.py is called: ["/usr/bin/python", "/home/haukex/emsdk/emscripten/1.38.28/tools/file_packager.py", "emperl.data", "--from-emcc", "--export-name=Module", "--preload", "/home/haukex/code/webperl/work/outputperl/opt/perl@/opt/perl", "--no-heap-copy"]
3333
export EMPERL_PRELOAD_FILE="$EMPERL_OUTPUTDIR$EMPERL_PREFIX@$EMPERL_PREFIX"

0 commit comments

Comments
 (0)