Skip to content

Commit

Permalink
Update msys2 environment to 240810 level
Browse files Browse the repository at this point in the history
- Update to upstream snapshot 240727
- Update automake to automake-1.17

See RM #778

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
  • Loading branch information
cazfi committed Aug 16, 2024
1 parent 7ea32b2 commit 65bd69b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
make
gettext
git
automake1.16
automake1.17
libtool
autoconf
mingw-w64-ucrt-x86_64-7zip
Expand Down
8 changes: 4 additions & 4 deletions doc/README.msys2
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ using MSYS2 from https://www.msys2.org/
==============

Current official premade MSYS2 environment version info:
[premade]: msys2-freeciv-win64-240516.7z
[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240507.exe
[premade]: msys2-freeciv-win64-240810.7z
[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240727.exe

See chapter "Premade environment" for what these mean. The info
is located here for quick reference for the specific freeciv revision.
Expand Down Expand Up @@ -75,7 +75,7 @@ is located here for quick reference for the specific freeciv revision.
freeciv.

- git
- automake1.16
- automake1.17
- libtool
- autoconf2.72
- autoconf-wrapper
Expand Down Expand Up @@ -155,7 +155,7 @@ Following packages have been installed:
- tar
- git
- patch
- automake1.16
- automake1.17
- libtool
- autoconf2.72
- autoconf-wrapper
Expand Down
5 changes: 4 additions & 1 deletion platforms/windows/installer_msys2/Makefile.autotools
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/
ifeq ($(CI),yes)
ICUVER=75
else
ICUVER=74
ICUVER=75
endif

#
Expand Down Expand Up @@ -270,6 +270,7 @@ COMMON_DLLS := \
libssl-${CRYPTOVERSUF}.dll \
libidn2-0.dll \
libnghttp2-14.dll \
libnghttp3-9.dll \
libssh2-1.dll \
libcurl-4.dll \
libgmp-10.dll \
Expand Down Expand Up @@ -468,6 +469,7 @@ RULEDIT_QT5_DLLS := \
libssl-${CRYPTOVERSUF}.dll \
libidn2-0.dll \
libnghttp2-14.dll \
libnghttp3-9.dll \
libssh2-1.dll \
libcurl-4.dll \
libgmp-10.dll \
Expand Down Expand Up @@ -526,6 +528,7 @@ RULEDIT_QT6_DLLS := \
libssl-${CRYPTOVERSUF}.dll \
libidn2-0.dll \
libnghttp2-14.dll \
libnghttp3-9.dll \
libssh2-1.dll \
libcurl-4.dll \
libgmp-10.dll \
Expand Down
3 changes: 2 additions & 1 deletion platforms/windows/installer_msys2/Makefile.meson
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/
ifeq ($(CI),yes)
ICUVER=75
else
ICUVER=74
ICUVER=75
endif

#
Expand Down Expand Up @@ -218,6 +218,7 @@ COMMON_DLLS := \
libssl-${CRYPTOVERSUF}.dll \
libidn2-0.dll \
libnghttp2-14.dll \
libnghttp3-9.dll \
libpsl-5.dll \
libssh2-1.dll \
libreadline8.dll \
Expand Down

0 comments on commit 65bd69b

Please sign in to comment.