rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 10:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix jsonb_plperl build on Windows

Browse Source
This commit is contained in:
Peter Eisentraut 2018-04-03 10:43:16 -04:00
parent 10d62d1065
commit 4ab2999815
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/msvc/Install.pm
View File

@ -464,6 +464,7 @@ sub CopyContribFiles
next if ($d eq "sslinfo" && !defined($config->{openssl})); next if ($d eq "sslinfo" && !defined($config->{openssl}));
next if ($d eq "xml2" && !defined($config->{xml})); next if ($d eq "xml2" && !defined($config->{xml}));
next if ($d eq "hstore_plperl" && !defined($config->{perl})); 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 "hstore_plpython" && !defined($config->{python}));
next if ($d eq "jsonb_plpython" && !defined($config->{python})); next if ($d eq "jsonb_plpython" && !defined($config->{python}));
next if ($d eq "ltree_plpython" && !defined($config->{python})); next if ($d eq "ltree_plpython" && !defined($config->{python}));

8
src/tools/msvc/Mkvcbuild.pm
View File

@ -43,7 +43,7 @@ my $contrib_extrasource = {
my @contrib_excludes = ( my @contrib_excludes = (
'commit_ts', 'hstore_plperl', 'commit_ts', 'hstore_plperl',
'hstore_plpython', 'intagg', 'hstore_plpython', 'intagg',
'jsonb_plpython', 'jsonb_plperl', 'jsonb_plpython',
'ltree_plpython', 'pgcrypto', 'ltree_plpython', 'pgcrypto',
'sepgsql', 'brin', 'sepgsql', 'brin',
'test_extensions', 'test_pg_dump', '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( my $hstore_plperl = AddTransformModule(
'hstore_plperl', 'contrib/hstore_plperl', 'hstore_plperl', 'contrib/hstore_plperl',
'plperl', 'src/pl/plperl', 'plperl', 'src/pl/plperl',
'hstore', 'contrib/hstore'); 'hstore', 'contrib/hstore');
my $jsonb_plperl = AddTransformModule(
'jsonb_plperl', 'contrib/jsonb_plperl',
'plperl', 'src/pl/plperl');
foreach my $f (@perl_embed_ccflags) foreach my $f (@perl_embed_ccflags)
{ {
$hstore_plperl->AddDefine($f); $hstore_plperl->AddDefine($f);
$jsonb_plperl->AddDefine($f);
} }
} }

1
src/tools/msvc/vcregress.pl
View File

@ -376,6 +376,7 @@ sub contribcheck
next if ($module eq "sslinfo" && !defined($config->{openssl})); next if ($module eq "sslinfo" && !defined($config->{openssl}));
next if ($module eq "xml2" && !defined($config->{xml})); next if ($module eq "xml2" && !defined($config->{xml}));
next if ($module eq "hstore_plperl" && !defined($config->{perl})); 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 "hstore_plpython" && !defined($config->{python}));
next if ($module eq "jsonb_plpython" && !defined($config->{python})); next if ($module eq "jsonb_plpython" && !defined($config->{python}));
next if ($module eq "ltree_plpython" && !defined($config->{python})); next if ($module eq "ltree_plpython" && !defined($config->{python}));