diff --git a/Dockerfile.mingw b/Dockerfile.mingw index f3864353..4e16d87e 100644 --- a/Dockerfile.mingw +++ b/Dockerfile.mingw @@ -11,7 +11,7 @@ # $ sudo docker cp $id:/aria2/src/aria2c.exe # $ sudo docker rm -v $id -FROM ubuntu:16.04 +FROM ubuntu:19.04 MAINTAINER Tatsuhiro Tsujikawa @@ -25,15 +25,15 @@ ENV HOST i686-w64-mingw32 RUN apt-get update && \ apt-get install -y \ make binutils autoconf automake autotools-dev libtool \ - pkg-config git curl dpkg-dev gcc-mingw-w64 \ + pkg-config git curl dpkg-dev gcc-mingw-w64 g++-mingw-w64 \ autopoint libcppunit-dev libxml2-dev libgcrypt11-dev lzip RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz && \ - curl -L -O https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2 && \ - curl -L -O https://www.sqlite.org/2018/sqlite-autoconf-3230100.tar.gz && \ + curl -L -O https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.bz2 && \ + curl -L -O https://www.sqlite.org/2019/sqlite-autoconf-3290000.tar.gz && \ curl -L -O http://zlib.net/zlib-1.2.11.tar.gz && \ - curl -L -O https://c-ares.haxx.se/download/c-ares-1.14.0.tar.gz && \ - curl -L -O http://libssh2.org/download/libssh2-1.8.0.tar.gz + curl -L -O https://c-ares.haxx.se/download/c-ares-1.15.0.tar.gz && \ + curl -L -O https://www.libssh2.org/download/libssh2-1.9.0.tar.gz RUN tar xf gmp-6.1.2.tar.lz && \ cd gmp-6.1.2 && \ @@ -47,8 +47,8 @@ RUN tar xf gmp-6.1.2.tar.lz && \ CFLAGS="-mtune=generic -O2 -g0" && \ make install -RUN tar xf expat-2.2.5.tar.bz2 && \ - cd expat-2.2.5 && \ +RUN tar xf expat-2.2.7.tar.bz2 && \ + cd expat-2.2.7 && \ ./configure \ --disable-shared \ --enable-static \ @@ -57,8 +57,8 @@ RUN tar xf expat-2.2.5.tar.bz2 && \ --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \ make install -RUN tar xf sqlite-autoconf-3230100.tar.gz && \ - cd sqlite-autoconf-3230100 && \ +RUN tar xf sqlite-autoconf-3290000.tar.gz && \ + cd sqlite-autoconf-3290000 && \ ./configure \ --disable-shared \ --enable-static \ @@ -81,8 +81,8 @@ RUN tar xf zlib-1.2.11.tar.gz && \ --static && \ make install -RUN tar xf c-ares-1.14.0.tar.gz && \ - cd c-ares-1.14.0 && \ +RUN tar xf c-ares-1.15.0.tar.gz && \ + cd c-ares-1.15.0 && \ ./configure \ --disable-shared \ --enable-static \ @@ -93,8 +93,8 @@ RUN tar xf c-ares-1.14.0.tar.gz && \ LIBS="-lws2_32" && \ make install -RUN tar xf libssh2-1.8.0.tar.gz && \ - cd libssh2-1.8.0 && \ +RUN tar xf libssh2-1.9.0.tar.gz && \ + cd libssh2-1.9.0 && \ ./configure \ --disable-shared \ --enable-static \ diff --git a/README.mingw b/README.mingw index 4a596ea0..a8bbe978 100644 --- a/README.mingw +++ b/README.mingw @@ -5,19 +5,20 @@ aria2 Windows build is provided in 2 flavors: 32bit version and 64bit version. The executable was compiled using mingw-w64 cross compiler on Debian Linux. -* gcc-mingw-w64 7.3.0-18+20.3 -* binutils-mingw-w64-i686 2.30-13+8.1 -* binutils-mingw-w64-x86-64 2.30-13+8.1 +* gcc-mingw-w64 8.3.0-19+21.4 +* g++-mingw-w64 8.3.0-19+21.4 +* binutils-mingw-w64-i686 2.32.51.20190707-1+8.4 +* binutils-mingw-w64-x86-64 2.32.51.20190707-1+8.4 The executable is statically linked, so no extra DLLs are necessary. The linked libraries are: * gmp 6.1.2 -* expat 2.2.5 -* sqlite 3.23.1 +* expat 2.2.7 +* sqlite 3.29.0 * zlib 1.2.11 -* c-ares 1.14.0 -* libssh2 1.8.0 +* c-ares 1.15.0 +* libssh2 1.9.0 This build has the following difference from the original release: diff --git a/mingw-build-memo b/mingw-build-memo index eb0031dc..1b353da9 100644 --- a/mingw-build-memo +++ b/mingw-build-memo @@ -63,8 +63,7 @@ HOST=i686-w64-mingw32 --prefix=/usr/local/$HOST \ --host=$HOST \ --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \ - --without-openssl \ - --with-wincng \ + --with-crypto=wincng \ LIBS="-lws2_32" HOST=x86_64-w64-mingw32 diff --git a/mingw-config b/mingw-config index f4ad6dba..c903c0b6 100755 --- a/mingw-config +++ b/mingw-config @@ -78,4 +78,5 @@ test -z "$PREFIX" && PREFIX=/usr/local/$HOST ARIA2_STATIC=yes \ CPPFLAGS="-I$PREFIX/include" \ LDFLAGS="-L$PREFIX/lib" \ + PKG_CONFIG="/usr/bin/pkg-config" \ PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig"