mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-11-27 07:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only define NO_THREAD_SAFE_LOCALE for MSVC plperl when required

Browse Source 
Latest versions of Strawberry Perl define USE_THREAD_SAFE_LOCALE, and we
therefore get a handshake error when building against such instances.
The solution is to perform a test to see if USE_THREAD_SAFE_LOCALE is
defined and only define NO_THREAD_SAFE_LOCALE if it isn't.

Backpatch the meson.build fix back to release 16 and apply the same
logic to Mkvcbuild.pm in releases 12 through 16.

Original report of the issue from Muralikrishna Bandaru.
This commit is contained in:
Andrew Dunstan 2024-09-14 08:37:08 -04:00
parent fae55f0bb3
commit bc46104fc9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -1058,7 +1058,10 @@ if not perlopt.disabled()
if cc.get_id() == 'msvc' if cc.get_id() == 'msvc'
# prevent binary mismatch between MSVC built plperl and Strawberry or # prevent binary mismatch between MSVC built plperl and Strawberry or
# msys ucrt perl libraries # msys ucrt perl libraries
perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE'] perl_v = run_command(perl, '-V').stdout()
if not perl_v.contains('USE_THREAD_SAFE_LOCALE')
perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
endif
endif endif
endif endif