Windows package: bump dependencies

Note that MSYS2 is in the middle of the transition from xz to zstd for
compressing its archives, so we have to handle both formats.
parent cf523cb6
Pipeline #3679 passed with stages
in 95 minutes and 34 seconds
...@@ -222,24 +222,24 @@ msys2: lib32-msys2 lib64-msys2 mingw32 mingw64 ...@@ -222,24 +222,24 @@ msys2: lib32-msys2 lib64-msys2 mingw32 mingw64
MSYS2_EXCLUDES := --exclude .MTREE --exclude .BUILDINFO --exclude .PKGINFO MSYS2_EXCLUDES := --exclude .MTREE --exclude .BUILDINFO --exclude .PKGINFO
lib32-msys2: tarballs/mingw-w64-i686-boost-$(MINGW32_BOOST_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-gsl-$(MINGW32_GSL_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-openblas-$(MINGW32_OPENBLAS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-matio-$(MINGW32_MATIO_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-zlib-$(MINGW32_ZLIB_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-hdf5-$(MINGW32_HDF5_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-szip-$(MINGW32_SZIP_VERSION)-any.pkg.tar.xz lib32-msys2: tarballs/mingw-w64-i686-boost-$(MINGW32_BOOST_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-i686-gsl-$(MINGW32_GSL_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-openblas-$(MINGW32_OPENBLAS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-matio-$(MINGW32_MATIO_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-i686-zlib-$(MINGW32_ZLIB_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-hdf5-$(MINGW32_HDF5_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-i686-szip-$(MINGW32_SZIP_VERSION)-any.pkg.tar.xz
rm -rf $@ rm -rf $@
mkdir $@ mkdir $@
for f in $^; do tar xf $$f --directory $@ --strip-components 1 $(MSYS2_EXCLUDES); done for f in $^; do tar xf $$f --directory $@ --strip-components 1 $(MSYS2_EXCLUDES); done
touch $@ touch $@
lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-gsl-$(MINGW64_GSL_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-openblas-$(MINGW64_OPENBLAS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-matio-$(MINGW64_MATIO_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-hdf5-$(MINGW64_HDF5_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-szip-$(MINGW64_SZIP_VERSION)-any.pkg.tar.xz lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gsl-$(MINGW64_GSL_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-openblas-$(MINGW64_OPENBLAS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-matio-$(MINGW64_MATIO_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-hdf5-$(MINGW64_HDF5_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-szip-$(MINGW64_SZIP_VERSION)-any.pkg.tar.xz
rm -rf $@ rm -rf $@
mkdir $@ mkdir $@
for f in $^; do tar xf $$f --directory $@ --strip-components 1 $(MSYS2_EXCLUDES); done for f in $^; do tar xf $$f --directory $@ --strip-components 1 $(MSYS2_EXCLUDES); done
touch $@ touch $@
mingw32: tarballs/mingw-w64-i686-gcc-$(MINGW32_GCC_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-gcc-libs-$(MINGW32_GCC_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-gmp-$(MINGW32_GMP_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-binutils-$(MINGW32_BINUTILS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-headers-git-$(MINGW32_HEADERS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-crt-git-$(MINGW32_CRT_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-winpthreads-git-$(MINGW32_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-libwinpthread-git-$(MINGW32_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-zlib-$(MINGW32_ZLIB_VERSION)-any.pkg.tar.xz mingw32: tarballs/mingw-w64-i686-gcc-$(MINGW32_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-i686-gcc-libs-$(MINGW32_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-i686-gmp-$(MINGW32_GMP_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-binutils-$(MINGW32_BINUTILS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-i686-headers-git-$(MINGW32_HEADERS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-crt-git-$(MINGW32_CRT_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-winpthreads-git-$(MINGW32_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-libwinpthread-git-$(MINGW32_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-i686-zlib-$(MINGW32_ZLIB_VERSION)-any.pkg.tar.xz
rm -rf $@ rm -rf $@
for f in $^; do tar xf $$f $(MSYS2_EXCLUDES); done for f in $^; do tar xf $$f $(MSYS2_EXCLUDES); done
touch $@ touch $@
mingw64: tarballs/mingw-w64-x86_64-gcc-$(MINGW64_GCC_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-gcc-libs-$(MINGW64_GCC_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-gmp-$(MINGW64_GMP_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-binutils-$(MINGW64_BINUTILS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-headers-git-$(MINGW64_HEADERS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-crt-git-$(MINGW64_CRT_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-winpthreads-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-libwinpthread-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.xz mingw64: tarballs/mingw-w64-x86_64-gcc-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gcc-libs-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gmp-$(MINGW64_GMP_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-binutils-$(MINGW64_BINUTILS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-headers-git-$(MINGW64_HEADERS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-crt-git-$(MINGW64_CRT_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-winpthreads-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-libwinpthread-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.xz tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.xz
rm -rf $@ rm -rf $@
for f in $^; do tar xf $$f $(MSYS2_EXCLUDES); done for f in $^; do tar xf $$f $(MSYS2_EXCLUDES); done
touch $@ touch $@
...@@ -250,6 +250,12 @@ tarballs/mingw-w64-i686-%-any.pkg.tar.xz: ...@@ -250,6 +250,12 @@ tarballs/mingw-w64-i686-%-any.pkg.tar.xz:
tarballs/mingw-w64-x86_64-%-any.pkg.tar.xz: tarballs/mingw-w64-x86_64-%-any.pkg.tar.xz:
wget $(WGET_OPTIONS) -O $@ http://repo.msys2.org/mingw/x86_64/$(notdir $@) wget $(WGET_OPTIONS) -O $@ http://repo.msys2.org/mingw/x86_64/$(notdir $@)
tarballs/mingw-w64-i686-%-any.pkg.tar.zst:
wget $(WGET_OPTIONS) -O $@ http://repo.msys2.org/mingw/i686/$(notdir $@)
tarballs/mingw-w64-x86_64-%-any.pkg.tar.zst:
wget $(WGET_OPTIONS) -O $@ http://repo.msys2.org/mingw/x86_64/$(notdir $@)
clean-msys2: clean-msys2:
rm -rf lib32-msys2 rm -rf lib32-msys2
rm -rf lib64-msys2 rm -rf lib64-msys2
...@@ -257,6 +263,8 @@ clean-msys2: ...@@ -257,6 +263,8 @@ clean-msys2:
rm -rf mingw64 rm -rf mingw64
rm -f tarballs/mingw-w64-i686-*.tar.xz rm -f tarballs/mingw-w64-i686-*.tar.xz
rm -f tarballs/mingw-w64-x86_64-*.tar.xz rm -f tarballs/mingw-w64-x86_64-*.tar.xz
rm -f tarballs/mingw-w64-i686-*.tar.zst
rm -f tarballs/mingw-w64-x86_64-*.tar.zst
# #
# X13AS # X13AS
......
...@@ -20,8 +20,8 @@ MATLAB64_VERSION = 20200407 ...@@ -20,8 +20,8 @@ MATLAB64_VERSION = 20200407
## Build dependencies ## Build dependencies
# pacman -Ss .*-boost$ # pacman -Ss .*-boost$
MINGW32_BOOST_VERSION = 1.72.0-1 MINGW32_BOOST_VERSION = 1.73.0-3
MINGW64_BOOST_VERSION = 1.72.0-1 MINGW64_BOOST_VERSION = 1.73.0-3
# pacman -Ss .*-gsl$ # pacman -Ss .*-gsl$
MINGW32_GSL_VERSION = 2.6-1 MINGW32_GSL_VERSION = 2.6-1
...@@ -32,8 +32,8 @@ MINGW32_OPENBLAS_VERSION = 0.3.9-1 ...@@ -32,8 +32,8 @@ MINGW32_OPENBLAS_VERSION = 0.3.9-1
MINGW64_OPENBLAS_VERSION = 0.3.9-1 MINGW64_OPENBLAS_VERSION = 0.3.9-1
# pacman -Ss .*-matio$ # pacman -Ss .*-matio$
MINGW32_MATIO_VERSION = 1.5.17-1 MINGW32_MATIO_VERSION = 1.5.17-2
MINGW64_MATIO_VERSION = 1.5.17-1 MINGW64_MATIO_VERSION = 1.5.17-2
# Dependency of matio (and of the MinGW compiler) # Dependency of matio (and of the MinGW compiler)
# pacman -Ss .*-zlib$ # pacman -Ss .*-zlib$
...@@ -42,8 +42,8 @@ MINGW64_ZLIB_VERSION = 1.2.11-7 ...@@ -42,8 +42,8 @@ MINGW64_ZLIB_VERSION = 1.2.11-7
# Dependency of matio # Dependency of matio
# pacman -Ss .*-hdf5$ # pacman -Ss .*-hdf5$
MINGW32_HDF5_VERSION = 1.10.5-1 MINGW32_HDF5_VERSION = 1.12.0-2
MINGW64_HDF5_VERSION = 1.10.5-1 MINGW64_HDF5_VERSION = 1.12.0-2
# Dependency of HDF5 # Dependency of HDF5
# pacman -Ss .*-szip$ # pacman -Ss .*-szip$
...@@ -53,25 +53,25 @@ MINGW64_SZIP_VERSION = 2.1.1-2 ...@@ -53,25 +53,25 @@ MINGW64_SZIP_VERSION = 2.1.1-2
## MinGW packages for the embedded compiler ## MinGW packages for the embedded compiler
# pacman -Ss mingw-w64-.*-gcc$ # pacman -Ss mingw-w64-.*-gcc$
MINGW32_GCC_VERSION = 9.3.0-1 MINGW32_GCC_VERSION = 10.1.0-2
MINGW64_GCC_VERSION = 9.3.0-1 MINGW64_GCC_VERSION = 10.1.0-2
# pacman -Ss mingw-w64-.*-gmp$ # pacman -Ss mingw-w64-.*-gmp$
MINGW32_GMP_VERSION = 6.2.0-1 MINGW32_GMP_VERSION = 6.2.0-1
MINGW64_GMP_VERSION = 6.2.0-1 MINGW64_GMP_VERSION = 6.2.0-1
# pacman -Ss mingw-w64-.*-binutils # pacman -Ss mingw-w64-.*-binutils
MINGW32_BINUTILS_VERSION = 2.34-1 MINGW32_BINUTILS_VERSION = 2.34-2
MINGW64_BINUTILS_VERSION = 2.34-1 MINGW64_BINUTILS_VERSION = 2.34-2
# pacman -Ss mingw-w64-.*-headers-git # pacman -Ss mingw-w64-.*-headers-git
MINGW32_HEADERS_VERSION = 8.0.0.5685.ef310786-1 MINGW32_HEADERS_VERSION = 8.0.0.5815.9517d302-1
MINGW64_HEADERS_VERSION = 8.0.0.5685.ef310786-1 MINGW64_HEADERS_VERSION = 8.0.0.5815.9517d302-1
# pacman -Ss mingw-w64-.*-crt-git # pacman -Ss mingw-w64-.*-crt-git
MINGW32_CRT_VERSION = 8.0.0.5685.ef310786-1 MINGW32_CRT_VERSION = 8.0.0.5815.9517d302-1
MINGW64_CRT_VERSION = 8.0.0.5685.ef310786-1 MINGW64_CRT_VERSION = 8.0.0.5815.9517d302-1
# pacman -Ss mingw-w64-.*-winpthreads-git # pacman -Ss mingw-w64-.*-winpthreads-git
MINGW32_WINPTHREADS_VERSION = 8.0.0.5680.0df6b89f-1 MINGW32_WINPTHREADS_VERSION = 8.0.0.5814.9dbf4cc1-1
MINGW64_WINPTHREADS_VERSION = 8.0.0.5680.0df6b89f-1 MINGW64_WINPTHREADS_VERSION = 8.0.0.5814.9dbf4cc1-1
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# On a Debian system, install the packages needed for Windows # On a Debian system, install the packages needed for Windows
# cross-compilation, and also setup the cross-compiler alternatives. # cross-compilation, and also setup the cross-compiler alternatives.
# Copyright © 2017-2019 Dynare Team # Copyright © 2017-2020 Dynare Team
# #
# This file is part of Dynare. # This file is part of Dynare.
# #
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
[[ $(id -u) == 0 ]] || { echo "You must be root" >&2; exit 1; } [[ $(id -u) == 0 ]] || { echo "You must be root" >&2; exit 1; }
PACKAGES=(make xz-utils p7zip bzip2 zip patch wget autoconf automake libtool PACKAGES=(make xz-utils p7zip bzip2 zip zstd patch wget autoconf automake
mingw-w64 gfortran-mingw-w64 parallel flex bison texlive libtool mingw-w64 gfortran-mingw-w64 parallel flex bison texlive
texlive-publishers texlive-latex-extra texlive-science texlive-publishers texlive-latex-extra texlive-science
texlive-fonts-extra lmodern python3-sphinx latexmk nsis) texlive-fonts-extra lmodern python3-sphinx latexmk nsis)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment