Merge pull request #1963 from linusyang92/mingw-docker

Fix MinGW build using Docker

docker/mingw/deps.sh

@@ -40,7 +40,15 @@ build_deps() {
     cd "$SRC/$MBEDTLS_SRC"
     make clean
     make lib WINDOWS=1 CC="${host}-gcc" AR="${host}-ar"
-    make install DESTDIR="${prefix}"
+    ## "make install" command from mbedtls
+    DESTDIR="${prefix}"
+    mkdir -p "${DESTDIR}"/include/mbedtls
+    cp -r include/mbedtls "${DESTDIR}"/include
+    mkdir -p "${DESTDIR}"/lib
+    cp -RP library/libmbedtls.*    "${DESTDIR}"/lib
+    cp -RP library/libmbedx509.*   "${DESTDIR}"/lib
+    cp -RP library/libmbedcrypto.* "${DESTDIR}"/lib
+    unset DESTDIR
 
     # sodium
     cd "$SRC/$SODIUM_SRC"

docker/mingw/prepare.sh

@@ -40,13 +40,13 @@ LIBEV_VER=mingw
 LIBEV_SRC=libev-${LIBEV_VER}
 LIBEV_URL=https://github.com/${PROJ_SITE}/libev/archive/${LIBEV_VER}.tar.gz
 
-## mbedTLS for MinGW
-MBEDTLS_VER=mingw
-MBEDTLS_SRC=mbedtls-${MBEDTLS_VER}
-MBEDTLS_URL=https://github.com/${PROJ_SITE}/mbedtls/archive/${MBEDTLS_VER}.tar.gz
-
 # Public libraries
 
+## mbedTLS
+MBEDTLS_VER=2.7.0
+MBEDTLS_SRC=mbedtls-${MBEDTLS_VER}
+MBEDTLS_URL=https://tls.mbed.org/download/mbedtls-${MBEDTLS_VER}-apache.tgz
+
 ## Sodium
 SODIUM_VER=1.0.16
 SODIUM_SRC=libsodium-${SODIUM_VER}

libcork

@@ -1 +1 @@
-Subproject commit 5b85948ec650f8e4584028f71018a2c0de2aae04
+Subproject commit d447acd7d1c3615759db01287205434fec90a2b4