From 8c8d25e3ba6a2929cd9c9d3af20d166146a74cf9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 14 Sep 2020 15:06:16 +0100
Subject: [PATCH] build-aux: Add a Meson cross-file for i386 builds with -m32

For now, this requires adding /usr/local/bin/i686-linux-gnu-pkg-config
to the sysroot by hand:

    #!/bin/sh
    export PKG_CONFIG_LIBDIR="/usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig"
    exec pkg-config "$@"

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 build-aux/meson/scout-i386.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 build-aux/meson/scout-i386.txt

diff --git a/build-aux/meson/scout-i386.txt b/build-aux/meson/scout-i386.txt
new file mode 100644
index 000000000..d2d2e1481
--- /dev/null
+++ b/build-aux/meson/scout-i386.txt
@@ -0,0 +1,20 @@
+[binaries]
+c = '/usr/bin/gcc-4.8'
+cpp = '/usr/bin/g++-4.8'
+ar = '/usr/bin/ar'
+strip = '/usr/bin/strip'
+pkgconfig = '/usr/local/bin/i686-linux-gnu-pkg-config'
+exe_wrapper = '/usr/bin/env'
+
+[properties]
+c_args = ['-m32']
+cpp_args = ['-m32']
+c_link_args = ['-m32']
+cpp_link_args = ['-m32']
+libdir = 'lib/i386-linux-gnu'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
-- 
GitLab