Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bc46104

Browse files
committed
Only define NO_THREAD_SAFE_LOCALE for MSVC plperl when required
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.
1 parent fae55f0 commit bc46104

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

meson.build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,10 @@ if not perlopt.disabled()
10581058
if cc.get_id() == 'msvc'
10591059
# prevent binary mismatch between MSVC built plperl and Strawberry or
10601060
# msys ucrt perl libraries
1061-
perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
1061+
perl_v = run_command(perl, '-V').stdout()
1062+
if not perl_v.contains('USE_THREAD_SAFE_LOCALE')
1063+
perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
1064+
endif
10621065
endif
10631066
endif
10641067

0 commit comments

Comments
 (0)