From 825d95e8a8b266110d3d7eaa38a8f4abcf146a1a Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Fri, 7 Jan 2022 15:48:53 -0500 Subject: [PATCH] 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. --- src/tools/msvc/Install.pm | 1 + src/tools/msvc/vcregress.pl | 1 + 2 files changed, 2 insertions(+) diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index c932322e35..f5601c997f 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 29086cab51..2380cff2b9 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}));