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

Commitcd0b3e5

Browse files
authored
gh-140849: Update bundled liblzma to 5.8.1 on Windows (#141022)
1 parentd13ee0a commitcd0b3e5

File tree

6 files changed

+14
-17
lines changed

6 files changed

+14
-17
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update bundled liblzma to version 5.8.1.

‎Misc/externals.spdx.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,21 @@
154154
"checksums": [
155155
{
156156
"algorithm":"SHA256",
157-
"checksumValue":"a15c168e39e87d750c3dc766edc7f19bdda57dacf01e509678467eace91ad282"
157+
"checksumValue":"1bfaba0ccacc6681d3ba85335cc7f49c24cf6f9d16f848cbd153b896d8a7d631"
158158
}
159159
],
160-
"downloadLocation":"https://github.com/python/cpython-source-deps/archive/refs/tags/xz-5.2.5.tar.gz",
160+
"downloadLocation":"https://github.com/python/cpython-source-deps/archive/refs/tags/xz-5.8.1.1.tar.gz",
161161
"externalRefs": [
162162
{
163163
"referenceCategory":"SECURITY",
164-
"referenceLocator":"cpe:2.3:a:tukaani:xz:5.2.5:*:*:*:*:*:*:*",
164+
"referenceLocator":"cpe:2.3:a:tukaani:xz:5.8.1.1:*:*:*:*:*:*:*",
165165
"referenceType":"cpe23Type"
166166
}
167167
],
168168
"licenseConcluded":"NOASSERTION",
169169
"name":"xz",
170170
"primaryPackagePurpose":"SOURCE",
171-
"versionInfo":"5.2.5"
171+
"versionInfo":"5.8.1.1"
172172
},
173173
{
174174
"SPDXID":"SPDXRef-PACKAGE-zlib-ng",

‎PCbuild/get_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ set libraries=%libraries% mpdecimal-4.0.0
5959
setlibraries=%libraries% sqlite-3.50.4.0
6060
ifNOT"%IncludeTkinterSrc%"=="false"setlibraries=%libraries% tcl-core-8.6.15.0
6161
ifNOT"%IncludeTkinterSrc%"=="false"setlibraries=%libraries% tk-8.6.15.0
62-
setlibraries=%libraries% xz-5.2.5
62+
setlibraries=%libraries% xz-5.8.1.1
6363
setlibraries=%libraries% zlib-ng-2.2.4
6464
setlibraries=%libraries% zstd-1.5.7
6565

‎PCbuild/liblzma.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<ItemDefinitionGroup>
9393
<ClCompile>
9494
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95-
<AdditionalIncludeDirectories>$(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
95+
<AdditionalIncludeDirectories>$(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9696
<DisableSpecificWarnings>4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
9797
<AdditionalOptionsCondition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-deprecated-declarations</AdditionalOptions>
9898
</ClCompile>
@@ -102,9 +102,7 @@
102102
<ClCompileInclude="$(lzmaDir)src\common\tuklib_physmem.c" />
103103
<ClCompileInclude="$(lzmaDir)src\liblzma\check\check.c" />
104104
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc32_fast.c" />
105-
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc32_table.c" />
106105
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc64_fast.c" />
107-
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc64_table.c" />
108106
<ClCompileInclude="$(lzmaDir)src\liblzma\check\sha256.c" />
109107
<ClCompileInclude="$(lzmaDir)src\liblzma\common\alone_decoder.c" />
110108
<ClCompileInclude="$(lzmaDir)src\liblzma\common\alone_encoder.c" />
@@ -163,6 +161,7 @@
163161
<ClCompileInclude="$(lzmaDir)src\liblzma\lz\lz_encoder_mf.c" />
164162
<ClCompileInclude="$(lzmaDir)src\liblzma\rangecoder\price_table.c" />
165163
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\arm.c" />
164+
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\arm64.c" />
166165
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\armthumb.c" />
167166
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\ia64.c" />
168167
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\powerpc.c" />
@@ -239,7 +238,7 @@
239238
<ClIncludeInclude="$(lzmaDir)src\liblzma\simple\simple_decoder.h" />
240239
<ClIncludeInclude="$(lzmaDir)src\liblzma\simple\simple_encoder.h" />
241240
<ClIncludeInclude="$(lzmaDir)src\liblzma\simple\simple_private.h" />
242-
<ClIncludeInclude="$(lzmaDir)windows\vs2019\config.h" />
241+
<ClIncludeInclude="$(lzmaDir)windows\config.h" />
243242
</ItemGroup>
244243
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
245244
<ImportGroupLabel="ExtensionTargets">

‎PCbuild/liblzma.vcxproj.filters‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\arm.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21+
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\arm64.c">
22+
<Filter>Source Files</Filter>
23+
</ClCompile>
2124
<ClCompileInclude="$(lzmaDir)src\liblzma\simple\armthumb.c">
2225
<Filter>Source Files</Filter>
2326
</ClCompile>
@@ -54,15 +57,9 @@
5457
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc32_fast.c">
5558
<Filter>Source Files</Filter>
5659
</ClCompile>
57-
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc32_table.c">
58-
<Filter>Source Files</Filter>
59-
</ClCompile>
6060
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc64_fast.c">
6161
<Filter>Source Files</Filter>
6262
</ClCompile>
63-
<ClCompileInclude="$(lzmaDir)src\liblzma\check\crc64_table.c">
64-
<Filter>Source Files</Filter>
65-
</ClCompile>
6663
<ClCompileInclude="$(lzmaDir)src\liblzma\delta\delta_common.c">
6764
<Filter>Source Files</Filter>
6865
</ClCompile>
@@ -428,7 +425,7 @@
428425
<ClIncludeInclude="$(lzmaDir)src\liblzma\simple\simple_private.h">
429426
<Filter>Header Files</Filter>
430427
</ClInclude>
431-
<ClIncludeInclude="$(lzmaDir)windows\vs2019\config.h">
428+
<ClIncludeInclude="$(lzmaDir)windows\config.h">
432429
<Filter>Header Files</Filter>
433430
</ClInclude>
434431
</ItemGroup>

‎PCbuild/python.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<PropertyGroup>
7878
<sqlite3DirCondition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.50.4.0\</sqlite3Dir>
7979
<bz2DirCondition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
80-
<lzmaDirCondition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
80+
<lzmaDirCondition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.8.1.1\</lzmaDir>
8181
<libffiDirCondition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
8282
<libffiOutDirCondition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
8383
<libffiIncludeDirCondition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>

0 commit comments

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