Commit4ab2999

committed

Attempt to fix jsonb_plperl build on Windows

1 parent10d62d1 commit4ab2999Copy full SHA for 4ab2999

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,7 @@ sub CopyContribFiles`
`464`	`464`	`nextif ($deq"sslinfo" && !defined($config->{openssl}));`
`465`	`465`	`nextif ($deq"xml2" && !defined($config->{xml}));`
`466`	`466`	`nextif ($deq"hstore_plperl" && !defined($config->{perl}));`
	`467`	`+nextif ($deq"jsonb_plperl" && !defined($config->{perl}));`
`467`	`468`	`nextif ($deq"hstore_plpython" && !defined($config->{python}));`
`468`	`469`	`nextif ($deq"jsonb_plpython" && !defined($config->{python}));`
`469`	`470`	`nextif ($deq"ltree_plpython" && !defined($config->{python}));`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ my $contrib_extrasource = {`
`43`	`43`	`my@contrib_excludes = (`
`44`	`44`	`'commit_ts','hstore_plperl',`
`45`	`45`	`'hstore_plpython','intagg',`
`46`		`-'jsonb_plpython',`
	`46`	`+'jsonb_plperl','jsonb_plpython',`
`47`	`47`	`'ltree_plpython','pgcrypto',`
`48`	`48`	`'sepgsql','brin',`
`49`	`49`	`'test_extensions','test_pg_dump',`
`@@ -746,15 +746,19 @@ sub mkvcbuild`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`
`749`		`-# Add transformmodule dependent on plperl`
	`749`	`+# Add transformmodules dependent on plperl`
`750`	`750`	`my$hstore_plperl = AddTransformModule(`
`751`	`751`	`'hstore_plperl','contrib/hstore_plperl',`
`752`	`752`	`'plperl','src/pl/plperl',`
`753`	`753`	`'hstore','contrib/hstore');`
	`754`	`+my$jsonb_plperl = AddTransformModule(`
	`755`	`+'jsonb_plperl','contrib/jsonb_plperl',`
	`756`	`+'plperl','src/pl/plperl');`
`754`	`757`
`755`	`758`	`foreachmy$f (@perl_embed_ccflags)`
`756`	`759`	`{`
`757`	`760`	`$hstore_plperl->AddDefine($f);`
	`761`	`+$jsonb_plperl->AddDefine($f);`
`758`	`762`	`}`
`759`	`763`	`}`
`760`	`764`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,7 @@ sub contribcheck`
`376`	`376`	`nextif ($moduleeq"sslinfo" && !defined($config->{openssl}));`
`377`	`377`	`nextif ($moduleeq"xml2" && !defined($config->{xml}));`
`378`	`378`	`nextif ($moduleeq"hstore_plperl" && !defined($config->{perl}));`
	`379`	`+nextif ($moduleeq"jsonb_plperl" && !defined($config->{perl}));`
`379`	`380`	`nextif ($moduleeq"hstore_plpython" && !defined($config->{python}));`
`380`	`381`	`nextif ($moduleeq"jsonb_plpython" && !defined($config->{python}));`
`381`	`382`	`nextif ($moduleeq"ltree_plpython" && !defined($config->{python}));`

Comments

(0)