diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-07-19 12:14:42 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-07-19 12:14:42 +0200 |
| commit | 4d3db13621be64fbac2faf7c01c4879d20885c1b (patch) | |
| tree | 3be086260f4954c93750d49a2756a9e698c0d950 /src | |
| parent | 9b14280b207053f8b09e20b5719785ec4413b9d2 (diff) | |
Define OPENSSL_API_COMPAT
This avoids deprecation warnings from newer OpenSSL versions (3.0.0 in
particular).
Discussion: https://www.postgresql.org/message-id/flat/FEF81714-D479-4512-839B-C769D2605F8A%40yesql.se
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/pg_config.h.in | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index c199cd46d2d..73aa6181669 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -749,6 +749,10 @@ /* Define bytes to use libc memset(). */ #undef MEMSET_LOOP_LIMIT +/* Define to the OpenSSL API version in use. This avoids deprecation warnings + from newer OpenSSL versions. */ +#undef OPENSSL_API_COMPAT + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index a13ca6e02e8..023da623826 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -152,6 +152,8 @@ sub GenerateFiles my $package_bugreport; my $package_url; my ($majorver, $minorver); + my $ac_define_openssl_api_compat_found = 0; + my $openssl_api_compat; # Parse configure.in to get version numbers open(my $c, '<', "configure.in") @@ -176,10 +178,15 @@ sub GenerateFiles $majorver = sprintf("%d", $1); $minorver = sprintf("%d", $2 ? $2 : 0); } + elsif (/\bAC_DEFINE\(OPENSSL_API_COMPAT, \[([0-9xL]+)\]/) + { + $ac_define_openssl_api_compat_found = 1; + $openssl_api_compat = $1; + } } close($c); confess "Unable to parse configure.in for all variables!" - unless $ac_init_found; + unless $ac_init_found && $ac_define_openssl_api_compat_found; if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h")) { @@ -433,6 +440,7 @@ sub GenerateFiles LOCALE_T_IN_XLOCALE => undef, MAXIMUM_ALIGNOF => 8, MEMSET_LOOP_LIMIT => 1024, + OPENSSL_API_COMPAT => $openssl_api_compat, PACKAGE_BUGREPORT => qq{"$package_bugreport"}, PACKAGE_NAME => qq{"$package_name"}, PACKAGE_STRING => qq{"$package_name $package_version"}, |