From af9dc106e3ac4afd87f8aaf9ab4133f5819adf60 Mon Sep 17 00:00:00 2001 From: Linus Yang Date: Fri, 23 Mar 2018 03:48:47 +0800 Subject: [PATCH] MinGW: speed up docker build --- docker/mingw/build.sh | 28 ++++++++++++++++++---------- docker/mingw/deps.sh | 3 +-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/docker/mingw/build.sh b/docker/mingw/build.sh index 04a0ac30..382f9b21 100644 --- a/docker/mingw/build.sh +++ b/docker/mingw/build.sh @@ -31,11 +31,15 @@ build_proj() { dep=${PREFIX}/$arch cd "$SRC" - git clone ${PROJ_URL} proj - cd proj - git checkout ${PROJ_REV} - git submodule update --init - ./autogen.sh + if ! [ -d proj ]; then + git clone ${PROJ_URL} proj + cd proj + git checkout ${PROJ_REV} + git submodule update --init + ./autogen.sh + else + cd proj + fi ./configure --host=${host} --prefix=${prefix} \ --disable-documentation \ --with-ev="$dep" \ @@ -55,11 +59,15 @@ build_proj() { PLUGIN_REV=master cd "$SRC" - git clone ${PLUGIN_URL} plugin - cd plugin - git checkout ${PLUGIN_REV} - git submodule update --init - ./autogen.sh + if ! [ -d plugin ]; then + git clone ${PLUGIN_URL} plugin + cd plugin + git checkout ${PLUGIN_REV} + git submodule update --init + ./autogen.sh + else + cd plugin + fi ./configure --host=${host} --prefix=${prefix} \ --disable-documentation \ --with-ev="$dep" diff --git a/docker/mingw/deps.sh b/docker/mingw/deps.sh index 0899ccc4..7364b902 100644 --- a/docker/mingw/deps.sh +++ b/docker/mingw/deps.sh @@ -60,8 +60,7 @@ build_deps() { cd "$SRC/$PCRE_SRC" ./configure $args \ --enable-jit --disable-cpp \ - --enable-unicode-properties \ - --enable-pcre16 --enable-pcre32 + --enable-unicode-properties make clean make install