It's reasonably common for patches to have issues when built on 32-bits, so to prevent this, we can add a 32-bit build (if supported) to the "test-meson-builds.sh" script. The tricky bit is using a valid PKG_CONFIG_LIBDIR, so for now we use two common possibilities for where that should point to in order to get a successful build.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com> --- devtools/test-meson-builds.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index a87de635a..02db73e98 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -226,6 +226,19 @@ for f in $srcdir/config/ppc/ppc* ; do build build-$(basename $f | cut -d'-' -f-2) $f $use_shared done +# test a 32-bit build +if echo "int main(void) { return 0; }" | cc -m32 -x c - -o /dev/null 2> /dev/null ; then + if [ -d "/usr/lib/i386-linux-gnu" ] ; then + # 32-bit pkgconfig on debian/ubuntu + export PKG_CONFIG_LIBDIR="/usr/lib/i386-linux-gnu/pkgconfig" + else + # 32-bit pkgconfig on RHEL/fedora (lib vs lib64) + export PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig" + fi + build build-32-bit cc -Dc_args='-m32' -Dc_link_args='-m32' + unset PKG_CONFIG_LIBDIR +fi + # Test installation of the x86-default target, to be used for checking # the sample apps build using the pkg-config file for cflags and libs build_path=$(readlink -f $builds_dir/build-x86-default) -- 2.25.1