From 32a3bbb8a14053d8b30d3b9caf744a6ffab6f597 Mon Sep 17 00:00:00 2001
From: Hauke D <haukex@zero-g.net>
Date: Sat, 2 Mar 2019 21:37:19 +0100
Subject: [PATCH] Updated for Perl v5.28.1

---
 build/build.pl         | 7 ++++---
 build/emperl_config.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/build.pl b/build/build.pl
index 07dea00..f254f96 100755
--- a/build/build.pl
+++ b/build/build.pl
@@ -120,17 +120,18 @@ if (!-e $C{PERLSRCDIR}) {
 }
 GITSTUFF: {
 	my $d = pushd($C{PERLSRCDIR});
+	my $remhead;
 	eval {
 		git 'fetch';
+		$remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
 	1 } or do {
 		warn $@;
 		# Maybe we don't have network connectivity
-		if (prompt("Whoops, 'git fetch' failed. Continue anyway? [Yn]","y")=~/^\s*y/i)
+		if (prompt("Whoops, 'git' failed. Continue anyway? [Yn]","y")=~/^\s*y/i)
 			{ last GITSTUFF }
 		else { die "git fetch failed, aborting" }
 	};
 	my $myhead = git 'log', '-1', '--format=%h', $C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
-	my $remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
 	say STDERR "# Local branch is at $myhead, remote is $remhead";
 	if ($myhead ne $remhead) {
 		git 'merge-base', '--is-ancestor', $remhead, $myhead, {allow_exit=>[0,1]};
@@ -372,7 +373,7 @@ if ($needs_reconfig || !-e $destdir || $opts{remakeout}) {
 	safelink( $C{PERLSRCDIR}->file('ext','WebPerl','t','WebPerl.t'),
 		$destdir->file('dev','WebPerl.t') );
 	safelink( $C{PERLSRCDIR}->file('ext','WebPerl','lib','WebPerl.pm'),
-		$destdir->file('lib','5.28.0','wasm','WebPerl.pm') ); #TODO: should figure this directory out dynamically
+		$destdir->file('lib',$C{PERLVER}=~s/^v(?=5)//r,'wasm','WebPerl.pm') );
 	
 	#TODO Later: Provide an easy way for users to add files to the virtual file system
 	
diff --git a/build/emperl_config.sh b/build/emperl_config.sh
index 9bc9562..6930493 100755
--- a/build/emperl_config.sh
+++ b/build/emperl_config.sh
@@ -27,7 +27,7 @@ export EMPERL_OUTPUTDIR="$BASEDIR/work/outputperl"
 
 # Don't edit the following options unless you know what you're doing!
 # 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.
-export EMPERL_PERLVER="v5.28.0"
+export EMPERL_PERLVER="v5.28.1"
 export EMPERL_PREFIX="/opt/perl"
 # 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"]
 export EMPERL_PRELOAD_FILE="$EMPERL_OUTPUTDIR$EMPERL_PREFIX@$EMPERL_PREFIX"