From 4ab299981576ca0f3dbb879b5e2b704e743d87f3 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 3 Apr 2018 10:43:16 -0400
Subject: [PATCH] Attempt to fix jsonb_plperl build on Windows

---
 src/tools/msvc/Install.pm   | 1 +
 src/tools/msvc/Mkvcbuild.pm | 8 ++++++--
 src/tools/msvc/vcregress.pl | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 8f3cc173c5..33290993ad 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -464,6 +464,7 @@ sub CopyContribFiles
 			next if ($d eq "sslinfo"         && !defined($config->{openssl}));
 			next if ($d eq "xml2"            && !defined($config->{xml}));
 			next if ($d eq "hstore_plperl"   && !defined($config->{perl}));
+			next if ($d eq "jsonb_plperl"    && !defined($config->{perl}));
 			next if ($d eq "hstore_plpython" && !defined($config->{python}));
 			next if ($d eq "jsonb_plpython"  && !defined($config->{python}));
 			next if ($d eq "ltree_plpython"  && !defined($config->{python}));
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index f3ec75f874..71f72b16fc 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -43,7 +43,7 @@ my $contrib_extrasource = {
 my @contrib_excludes = (
 	'commit_ts',       'hstore_plperl',
 	'hstore_plpython', 'intagg',
-	'jsonb_plpython',
+	'jsonb_plperl',    'jsonb_plpython',
 	'ltree_plpython',  'pgcrypto',
 	'sepgsql',         'brin',
 	'test_extensions', 'test_pg_dump',
@@ -746,15 +746,19 @@ sub mkvcbuild
 			}
 		}
 
-		# Add transform module dependent on plperl
+		# Add transform modules dependent on plperl
 		my $hstore_plperl = AddTransformModule(
 			'hstore_plperl', 'contrib/hstore_plperl',
 			'plperl',        'src/pl/plperl',
 			'hstore',        'contrib/hstore');
+		my $jsonb_plperl = AddTransformModule(
+			'jsonb_plperl', 'contrib/jsonb_plperl',
+			'plperl',        'src/pl/plperl');
 
 		foreach my $f (@perl_embed_ccflags)
 		{
 			$hstore_plperl->AddDefine($f);
+			$jsonb_plperl->AddDefine($f);
 		}
 	}
 
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index bac218c016..2d6b67cedf 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -376,6 +376,7 @@ sub contribcheck
 		next if ($module eq "sslinfo"       && !defined($config->{openssl}));
 		next if ($module eq "xml2"          && !defined($config->{xml}));
 		next if ($module eq "hstore_plperl" && !defined($config->{perl}));
+		next if ($module eq "jsonb_plperl"  && !defined($config->{perl}));
 		next if ($module eq "hstore_plpython" && !defined($config->{python}));
 		next if ($module eq "jsonb_plpython"  && !defined($config->{python}));
 		next if ($module eq "ltree_plpython"  && !defined($config->{python}));