From 9be5ce1d736f1fc13de26533a0ffb2e57137c304 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Tue, 6 Aug 2019 11:28:31 +0100
Subject: [PATCH] gitlab-ci: generate meson cross-files earlier
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Suggested-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---
 .gitlab-ci.yml               | 14 ++++----------
 .gitlab-ci/debian-install.sh | 12 ++++++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10e6c4e99b9..69dd3fa0a66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-08-07"
+  DEBIAN_TAG: "2019-08-08"
   DEBIAN_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
@@ -251,19 +251,13 @@ meson-vulkan:
       -D gallium-xa=false
       -D gallium-nine=false
       -D llvm=false
-    CROSS: >
-      --cross /tmp/cross_file.txt
-
   script:
-    - /usr/share/meson/debcrossgen --arch ${ARCH} -o /tmp/cross_file.txt
-    # Work around a bug in debcrossgen that should be fixed in the next release
-    - sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" /tmp/cross_file.txt
     - .gitlab-ci/meson-build.sh
 
 meson-armhf:
   extends: .meson-cross
   variables:
-    ARCH: armhf
+    CROSS: --cross /cross_file-armhf.txt
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
     # Disable the tests since we're cross compiling.
@@ -275,7 +269,7 @@ meson-armhf:
 meson-arm64:
   extends: .meson-cross
   variables:
-    ARCH: arm64
+    CROSS: --cross /cross_file-arm64.txt
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
     # Disable the tests since we're cross compiling.
@@ -287,7 +281,7 @@ meson-arm64:
 meson-i386:
   extends: .meson-cross
   variables:
-    ARCH: i386
+    CROSS: --cross /cross_file-i386.txt
     VULKAN_DRIVERS: intel
     GALLIUM_DRIVERS: "swrast"
     # Disable i386 tests, because u_format_tests gets precision
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 8770e100ee0..eb4a37ee1e0 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -207,6 +207,18 @@ apt-get install -y ccache
 # We need xmllint to validate the XML files in Mesa
 apt-get install -y libxml2-utils
 
+
+# Generate cross build files for Meson
+for arch in $CROSS_ARCHITECTURES; do
+  cross_file="/cross_file-$arch.txt"
+  /usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
+  # Work around a bug in debcrossgen that should be fixed in the next release
+  if [ "$arch" = "i386" ]; then
+    sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"
+  fi
+done
+
+
 # Remove unused packages
 apt-get purge -y \
       git \
-- 
2.30.2