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

Commit0a0db46

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 parentd23109f commit0a0db46

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

‎meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,10 @@ if not perlopt.disabled()
10601060
if cc.get_id()=='msvc'
10611061
# prevent binary mismatch between MSVC built plperl and Strawberry or
10621062
# msys ucrt perl libraries
1063-
perl_ccflags+= ['-DNO_THREAD_SAFE_LOCALE']
1063+
perl_v=run_command(perl,'-V').stdout()
1064+
ifnot perl_v.contains('USE_THREAD_SAFE_LOCALE')
1065+
perl_ccflags+= ['-DNO_THREAD_SAFE_LOCALE']
1066+
endif
10641067
endif
10651068
endif
10661069

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,9 @@ sub mkvcbuild
595595
push(@perl_embed_ccflags,'PLPERL_HAVE_UID_GID');
596596
# prevent binary mismatch between MSVC built plperl and
597597
# Strawberry or msys ucrt perl libraries
598-
push(@perl_embed_ccflags,'NO_THREAD_SAFE_LOCALE');
598+
my$perl_v =`$^X -V 2>&1`;
599+
push(@perl_embed_ccflags,'NO_THREAD_SAFE_LOCALE')
600+
unless$perl_v =~/USE_THREAD_SAFE_LOCALE/;
599601

600602
# Windows offers several 32-bit ABIs. Perl is sensitive to
601603
# sizeof(time_t), one of the ABI dimensions. To get 32-bit time_t,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp