From: Thomas Monjalon <thomas@monjalon.net>
Date: Sun, 14 Jun 2020 21:58:45 +0000 (+0200)
Subject: devtools: add Windows cross-build test with MinGW
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=3b6431396afa7e5ac28bc8f461b93a3841f5e62a;p=dpdk.git

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 <thomas@monjalon.net>
---

diff --git a/config/x86/cross-mingw b/config/x86/cross-mingw
new file mode 100644
index 0000000000..4c15a7fa2e
--- /dev/null
+++ b/config/x86/cross-mingw
@@ -0,0 +1,13 @@
+[binaries]
+c = 'x86_64-w64-mingw32-gcc'
+cpp = 'x86_64-w64-mingw32-g++'
+ld = 'x86_64-w64-mingw32-ld'
+ar = 'x86_64-w64-mingw32-ar'
+strip = 'x86_64-w64-mingw32-strip'
+pkgconfig = 'x86_64-w64-mingw32-pkg-config'
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'native'
+endian = 'little'
diff --git a/config/x86/meson_mingw.txt b/config/x86/meson_mingw.txt
deleted file mode 100644
index 4c15a7fa2e..0000000000
--- a/config/x86/meson_mingw.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[binaries]
-c = 'x86_64-w64-mingw32-gcc'
-cpp = 'x86_64-w64-mingw32-g++'
-ld = 'x86_64-w64-mingw32-ld'
-ar = 'x86_64-w64-mingw32-ar'
-strip = 'x86_64-w64-mingw32-strip'
-pkgconfig = 'x86_64-w64-mingw32-pkg-config'
-
-[host_machine]
-system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'native'
-endian = 'little'
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