diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2022-01-07 15:48:53 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2022-01-07 15:48:53 -0500 |
| commit | 825d95e8a8b266110d3d7eaa38a8f4abcf146a1a (patch) | |
| tree | 5f5f4694cdf9f6372262aced259890509baccd48 /src | |
| parent | fb0745fa0d706d1519d6e55e93d1dcae27e12e4d (diff) | |
| download | postgresql-825d95e8a8b266110d3d7eaa38a8f4abcf146a1a.tar.gz postgresql-825d95e8a8b266110d3d7eaa38a8f4abcf146a1a.zip | |
Skip install/test of pgcrypto on MSVC when not built with openssl
Commit db7d1a7b05 missed a couple of places that needed adjustment now
we are not building pgcrypto when openssl is not configured, causing
contrib installcheck to fail in such a case.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Install.pm | 1 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index c932322e355..f5601c997f3 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -441,6 +441,7 @@ sub CopyContribFiles # These configuration-based exclusions must match vcregress.pl next if ($d eq "uuid-ossp" && !defined($config->{uuid})); next if ($d eq "sslinfo" && !defined($config->{openssl})); + next if ($d eq "pgcrypto" && !defined($config->{openssl})); next if ($d eq "xml2" && !defined($config->{xml})); next if ($d =~ /_plperl$/ && !defined($config->{perl})); next if ($d =~ /_plpython$/ && !defined($config->{python})); diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 29086cab516..2380cff2b9d 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -506,6 +506,7 @@ sub contribcheck # these configuration-based exclusions must match Install.pm next if ($module eq "uuid-ossp" && !defined($config->{uuid})); next if ($module eq "sslinfo" && !defined($config->{openssl})); + next if ($module eq "pgcrypto" && !defined($config->{openssl})); next if ($module eq "xml2" && !defined($config->{xml})); next if ($module =~ /_plperl$/ && !defined($config->{perl})); next if ($module =~ /_plpython$/ && !defined($config->{python})); |