Sfoglia il codice sorgente

Update third-party libraries for binary releases

Tatsuhiro Tsujikawa 9 anni fa
parent
commit
020859f8de
3 ha cambiato i file con 9 aggiunte e 11 eliminazioni
  1. 6 8
      Dockerfile.mingw
  2. 1 1
      README.android
  3. 2 2
      README.mingw

+ 6 - 8
Dockerfile.mingw

@@ -28,17 +28,15 @@ RUN apt-get update && \
         pkg-config git curl dpkg-dev gcc-mingw-w64 \
         autopoint libcppunit-dev libxml2-dev libgcrypt11-dev lzip
 
-RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.0.tar.lz && \
-    curl -L -o gmp-6.1.0.patch https://gmplib.org/repo/gmp-6.1/raw-rev/67d4ee9dead1 && \
-    curl -L -O http://downloads.sourceforge.net/project/expat/expat/2.1.1/expat-2.1.1.tar.gz && \
+RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.1.tar.lz && \
+    curl -L -O http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2 && \
     curl -L -O https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz && \
     curl -L -O http://zlib.net/zlib-1.2.8.tar.xz && \
     curl -L -O http://c-ares.haxx.se/download/c-ares-1.11.0.tar.gz && \
     curl -L -O http://libssh2.org/download/libssh2-1.7.0.tar.gz
 
-RUN tar xf gmp-6.1.0.tar.lz && \
-    cd gmp-6.1.0 && \
-    patch -p1 < ../gmp-6.1.0.patch && \
+RUN tar xf gmp-6.1.1.tar.lz && \
+    cd gmp-6.1.1 && \
     ./configure \
         --disable-shared \
         --enable-static \
@@ -49,8 +47,8 @@ RUN tar xf gmp-6.1.0.tar.lz && \
         CFLAGS="-mtune=generic -O2 -g0" && \
     make install
 
-RUN tar xf expat-2.1.1.tar.gz && \
-    cd expat-2.1.1 && \
+RUN tar xf expat-2.2.0.tar.bz2 && \
+    cd expat-2.2.0 && \
     ./configure \
         --disable-shared \
         --enable-static \

+ 1 - 1
README.android

@@ -43,7 +43,7 @@ aria2c executable was generated using android-ndk-r10d.
 The following libraries were statically linked.
 
 * openssl 1.0.2h
-* expat 2.1.1
+* expat 2.2.0
 * c-ares 1.11.0
 * libssh2 1.7.0
 

+ 2 - 2
README.mingw

@@ -12,8 +12,8 @@ Debian Linux.
 The executable is statically linked, so no extra DLLs are
 necessary. The linked libraries are:
 
-* gmp 6.1.0
-* expat 2.1.1
+* gmp 6.1.1
+* expat 2.2.0
 * sqlite 3.13.0
 * zlib 1.2.8
 * c-ares 1.11.0