Skip to content

Commit e146e4a

Browse files
committed
build: Updated build toolchain on windows
Also updated liblzma dll to v5.6.4
1 parent ff3ccea commit e146e4a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

Changes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ Revision history for GLPI agent
22

33
1.13 not yet released
44

5+
packaging:
6+
* Update Windows MSI packing building process to use:
7+
- gcc 14.2.0posix-12.0.0-msvcrt-r2
8+
- msys2-base 20240507
9+
- liblzma from xz 5.6.4
10+
511
1.12 Fri, 24 Jan 2025
612

713
core:

contrib/windows/packaging/ToolchainBuildJob.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use parent 'Exporter';
66
use constant {
77
# Toolchain setup
88
TOOLCHAIN_BASE_URL => 'https://github.com/brechtsanders/winlibs_mingw/releases/download',
9-
TOOLCHAIN_VERSION => '13.3.0posix-11.0.1-msvcrt-r1',
10-
TOOLCHAIN_ARCHIVE => 'winlibs-x86_64-posix-seh-gcc-13.3.0-mingw-w64msvcrt-11.0.1-r1.zip',
9+
TOOLCHAIN_VERSION => '14.2.0posix-12.0.0-msvcrt-r2',
10+
TOOLCHAIN_ARCHIVE => 'winlibs-x86_64-posix-seh-gcc-14.2.0-mingw-w64msvcrt-12.0.0-r2.zip',
1111
};
1212

1313
sub toolchain_build_steps {
@@ -39,8 +39,8 @@ sub toolchain_build_steps {
3939
{
4040
plugin => 'Perl::Dist::Strawberry::Step::Msys2',
4141
name => 'msys2-base',
42-
version => '20240507',
43-
folder => '2024-05-07',
42+
version => '20241208',
43+
folder => '2024-12-08',
4444
url => 'https://github.com/msys2/msys2-installer/releases/download/<folder>/<name>-x86_64-<version>.tar.xz',
4545
dest => 'msys64',
4646
},
@@ -91,7 +91,7 @@ sub toolchain_build_steps {
9191
{
9292
plugin => 'Perl::Dist::Strawberry::Step::BuildLibrary',
9393
name => 'xz',
94-
version => '5.6.2',
94+
version => '5.6.4',
9595
url => 'https://github.com/tukaani-project/<name>/releases/download/v<version>/<name>-<version>.tar.gz',
9696
skip_if_file => 'bin/liblzma-5__.dll',
9797
skip_test => 1,

0 commit comments

Comments
 (0)