Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbc46104

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 wetherefore get a handshake error when building against such instances.The solution is to perform a test to see if USE_THREAD_SAFE_LOCALE isdefined and only define NO_THREAD_SAFE_LOCALE if it isn't.Backpatch the meson.build fix back to release 16 and apply the samelogic to Mkvcbuild.pm in releases 12 through 16.Original report of the issue from Muralikrishna Bandaru.
1 parentfae55f0 commitbc46104

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

‎meson.build

Lines changed: 4 additions & 1 deletion
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+
ifnot 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)
[8]ページ先頭
©2009-2025 Movatter.jp