Skip to content
Snippets Groups Projects
Verified Commit 4f6448ae authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Windows package: zlib is a dependency of the MinGW compiler 

(cherry picked from commit fbf97a0d)
parent 0fa051fc
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
windows/deps/Makefile
+ 2
− 2
View file @ 4f6448ae
...@@ -234,12 +234,12 @@ lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.ta ...@@ -234,12 +234,12 @@ lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.ta
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-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_LIBWINPTHREAD_VERSION)-any.pkg.tar.xz mingw32: tarballs/mingw-w64-i686-gcc-$(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_LIBWINPTHREAD_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-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_LIBWINPTHREAD_VERSION)-any.pkg.tar.xz mingw64: tarballs/mingw-w64-x86_64-gcc-$(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_LIBWINPTHREAD_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 $@
......
windows/deps/versions.mk
+ 1
− 1
View file @ 4f6448ae
...@@ -35,7 +35,7 @@ MINGW64_OPENBLAS_VERSION = 0.3.7-1 ...@@ -35,7 +35,7 @@ MINGW64_OPENBLAS_VERSION = 0.3.7-1
MINGW32_MATIO_VERSION = 1.5.17-1 MINGW32_MATIO_VERSION = 1.5.17-1
MINGW64_MATIO_VERSION = 1.5.17-1 MINGW64_MATIO_VERSION = 1.5.17-1
# Dependency of matio # Dependency of matio (and of the MinGW compiler)
# pacman -Ss .*-zlib$ # pacman -Ss .*-zlib$
MINGW32_ZLIB_VERSION = 1.2.11-7 MINGW32_ZLIB_VERSION = 1.2.11-7
MINGW64_ZLIB_VERSION = 1.2.11-7 MINGW64_ZLIB_VERSION = 1.2.11-7
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment