[v2,7/7] examples/cmdline: build on Windows
diff mbox series

Message ID 20200730210652.14568-8-dmitry.kozliuk@gmail.com
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • cmdline: support Windows
Related show

Checks

Context Check Description
ci/Intel-compilation fail apply issues
ci/checkpatch success coding style OK

Commit Message

Dmitry Kozlyuk July 30, 2020, 9:06 p.m. UTC
Enable cmdline sample application as all dependencies are met.

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 examples/cmdline/commands.c | 1 -
 examples/cmdline/main.c     | 1 -
 examples/meson.build        | 6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)

Comments

Narcisa Ana Maria Vasile Sept. 26, 2020, 1:33 a.m. UTC | #1
Adding Khoa

-----Original Message-----
From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> 
Sent: Thursday, July 30, 2020 2:07 PM
To: dev@dpdk.org
Cc: Dmitry Malloy (MESHCHANINOV) <dmitrym@microsoft.com>; Narcisa Ana Maria Vasile <Narcisa.Vasile@microsoft.com>; Fady Bader <fady@mellanox.com>; Tal Shnaiderman <talshn@mellanox.com>; Kadam, Pallavi <pallavi.kadam@intel.com>; Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>; Olivier Matz <olivier.matz@6wind.com>
Subject: [EXTERNAL] [PATCH v2 7/7] examples/cmdline: build on Windows

Enable cmdline sample application as all dependencies are met.

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 examples/cmdline/commands.c | 1 -
 examples/cmdline/main.c     | 1 -
 examples/meson.build        | 6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c index 0e2232f03..f43eacfba 100644
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <netinet/in.h>
-#include <termios.h>
 #ifdef RTE_EXEC_ENV_FREEBSD
 #include <sys/socket.h>
 #endif
diff --git a/examples/cmdline/main.c b/examples/cmdline/main.c index f2f2e5a2f..bb7954245 100644
--- a/examples/cmdline/main.c
+++ b/examples/cmdline/main.c
@@ -8,7 +8,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <termios.h>
 #include <sys/queue.h>
 
 #include <cmdline_rdline.h>
diff --git a/examples/meson.build b/examples/meson.build index eb13e8210..2b8ebce3b 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -79,9 +79,9 @@ foreach example: examples
 
 	ext_deps = [execinfo]
 	includes = [include_directories(example)]
-	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
-	if is_windows
-		deps = ['eal'] # only supported lib on Windows currently
+	deps = ['eal', 'mempool', 'net', 'mbuf', 'cmdline']
+	if not is_windows
+		deps += ['ethdev'] # not currently supported
 	endif
 	subdir(example)
 
--
2.25.4
Khoa To Sept. 26, 2020, 6:03 a.m. UTC | #2
> -----Original Message-----
> From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> 
> diff --git a/examples/meson.build b/examples/meson.build index
> eb13e8210..2b8ebce3b 100644
> --- a/examples/meson.build
> +++ b/examples/meson.build
> @@ -79,9 +79,9 @@ foreach example: examples
> 
>  	ext_deps = [execinfo]
>  	includes = [include_directories(example)]
> -	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
> -	if is_windows
> -		deps = ['eal'] # only supported lib on Windows currently
> +	deps = ['eal', 'mempool', 'net', 'mbuf', 'cmdline']
> +	if not is_windows
> +		deps += ['ethdev'] # not currently supported
>  	endif

'ethdev' is now supported on Windows, so I think you can just have 'ethdev' in the common deps list.

>  	subdir(example)
> 
> --
> 2.25.4

Patch
diff mbox series

diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
index 0e2232f03..f43eacfba 100644
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c
@@ -11,7 +11,6 @@ 
 #include <stdarg.h>
 #include <errno.h>
 #include <netinet/in.h>
-#include <termios.h>
 #ifdef RTE_EXEC_ENV_FREEBSD
 #include <sys/socket.h>
 #endif
diff --git a/examples/cmdline/main.c b/examples/cmdline/main.c
index f2f2e5a2f..bb7954245 100644
--- a/examples/cmdline/main.c
+++ b/examples/cmdline/main.c
@@ -8,7 +8,6 @@ 
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <termios.h>
 #include <sys/queue.h>
 
 #include <cmdline_rdline.h>
diff --git a/examples/meson.build b/examples/meson.build
index eb13e8210..2b8ebce3b 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -79,9 +79,9 @@  foreach example: examples
 
 	ext_deps = [execinfo]
 	includes = [include_directories(example)]
-	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
-	if is_windows
-		deps = ['eal'] # only supported lib on Windows currently
+	deps = ['eal', 'mempool', 'net', 'mbuf', 'cmdline']
+	if not is_windows
+		deps += ['ethdev'] # not currently supported
 	endif
 	subdir(example)