From 331e05dc5ddb0c63bc53bd459ad77184b05fda43 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 6 Nov 2020 09:45:40 +0100
Subject: [PATCH] Move installing packages into tools/ci-install.sh

In tools/ci-build.sh the cross compile setup has to be moved further up
to match the correct subdirectory.

(cherry picked from commit 1e3d82d85e9a59ccabb329c8f2401207edd419be)
---
 tools/ci-build.sh   | 33 +++++++++------------------------
 tools/ci-install.sh | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index d9111df..e92d85b 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -111,46 +111,31 @@ case "$ci_buildsys" in
         ;;
 esac
 
-srcdir="$(pwd)"
-mkdir ci-build-${ci_variant}-${ci_host}
-cd ci-build-${ci_variant}-${ci_host}
-
-make="make -j${ci_parallel} V=1 VERBOSE=1"
-
+#
+# cross compile setup
+#
 case "$ci_host" in
     (*-w64-mingw32)
-        mirror=http://repo.msys2.org/mingw/${ci_host%%-*}
         if [ "${ci_host%%-*}" = i686 ]; then
             mingw="$(pwd)/mingw32"
         else
             mingw="$(pwd)/mingw64"
         fi
-        install -d "${mingw}"
         export PKG_CONFIG_LIBDIR="${mingw}/lib/pkgconfig"
         export PKG_CONFIG_PATH=
         export PKG_CONFIG="pkg-config --define-variable=prefix=${mingw}"
         unset CC
         unset CXX
-        for pkg in \
-            bzip2-1.0.8-1 \
-            expat-2.2.9-1 \
-            gcc-libs-9.3.0-2 \
-            gettext-0.19.8.1-8 \
-            glib2-2.64.2-1 \
-            iconv-1.16-1 \
-            libffi-3.3-1 \
-            libiconv-1.16-1 \
-            libwinpthread-git-8.0.0.5814.9dbf4cc1-1 \
-            pcre-8.44-1 \
-            zlib-1.2.11-7 \
-            ; do
-            wget ${mirror}/mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
-            tar -xvf mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
-        done
         export TMPDIR=/tmp
         ;;
 esac
 
+srcdir="$(pwd)"
+mkdir ci-build-${ci_variant}-${ci_host}
+cd ci-build-${ci_variant}-${ci_host}
+
+make="make -j${ci_parallel} V=1 VERBOSE=1"
+
 case "$ci_buildsys" in
     (autotools)
         case "$ci_variant" in
diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 0681579..4df5ede 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -134,6 +134,33 @@ case "$ci_distro" in
                     ${NULL}
                 ;;
         esac
+        case "$ci_host" in
+            (*-w64-mingw32)
+                mirror=http://repo.msys2.org/mingw/${ci_host%%-*}
+                if [ "${ci_host%%-*}" = i686 ]; then
+                    mingw="$(pwd)/mingw32"
+                else
+                    mingw="$(pwd)/mingw64"
+                fi
+                install -d "${mingw}"
+                for pkg in \
+                    bzip2-1.0.8-1 \
+                    expat-2.2.9-1 \
+                    gcc-libs-9.3.0-2 \
+                    gettext-0.19.8.1-8 \
+                    glib2-2.64.2-1 \
+                    iconv-1.16-1 \
+                    libffi-3.3-1 \
+                    libiconv-1.16-1 \
+                    libwinpthread-git-8.0.0.5814.9dbf4cc1-1 \
+                    pcre-8.44-1 \
+                    zlib-1.2.11-7 \
+                    ; do
+                    wget ${mirror}/mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
+                    tar -xvf mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
+                done
+                ;;
+        esac
 
         $sudo apt-get -qq -y --no-install-recommends install \
             adduser \
-- 
2.7.4