From 3b6431396afa7e5ac28bc8f461b93a3841f5e62a Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sun, 14 Jun 2020 23:58:45 +0200 Subject: [PATCH] devtools: add Windows cross-build test with MinGW The Meson cross file is renamed from meson_mingw.txt to cross-mingw, and is added to test-meson-builds.sh. The only example supported on Windows so far is "helloworld", that's why the default list of examples is overridden. Signed-off-by: Thomas Monjalon --- config/x86/{meson_mingw.txt => cross-mingw} | 0 devtools/test-meson-builds.sh | 3 +++ doc/guides/windows_gsg/build_dpdk.rst | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) rename config/x86/{meson_mingw.txt => cross-mingw} (100%) diff --git a/config/x86/meson_mingw.txt b/config/x86/cross-mingw similarity index 100% rename from config/x86/meson_mingw.txt rename to config/x86/cross-mingw diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index eaa215f13e..64a022ccf1 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -200,6 +200,9 @@ if [ "$ok" = "false" ] ; then fi build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared +# x86 MinGW +build build-x86-mingw $srcdir/config/x86/cross-mingw -Dexamples=helloworld + # generic armv8a with clang as host compiler f=$srcdir/config/arm/arm64_armv8_linux_gcc export CC="clang" diff --git a/doc/guides/windows_gsg/build_dpdk.rst b/doc/guides/windows_gsg/build_dpdk.rst index 5757446cca..5f1395f3d4 100644 --- a/doc/guides/windows_gsg/build_dpdk.rst +++ b/doc/guides/windows_gsg/build_dpdk.rst @@ -111,5 +111,5 @@ Depending on the distribution, paths in this file may need adjustments. .. code-block:: console - meson --cross-file config/x86/meson_mingw.txt -Dexamples=helloworld build + meson --cross-file config/x86/cross-mingw -Dexamples=helloworld build ninja -C build -- 2.20.1