DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ric Li <ricmli@outlook.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com
Subject: [PATCH v2 1/2] build: fix list_dir_globs failure in MSYS2
Date: Wed, 20 Sep 2023 22:18:45 +0800	[thread overview]
Message-ID: <TYAP286MB0300BB597DDFC33CF7D2BA70CCF9A@TYAP286MB0300.JPNP286.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <TYAP286MB0300609982071AF15679FD8ACCF5A@TYAP286MB0300.JPNP286.PROD.OUTLOOK.COM>

When running 'meson setup' on Windows with MSYS2,
"list-dir-globs.py * failed with status 1".

Avoid using globbing to get components for app build
since they are already listed in the meson file.

Signed-off-by: Ric Li <ricmli@outlook.com>
---
 app/meson.build | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index e4bf5c531c..75ac37bef9 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -5,15 +5,6 @@ if is_ms_compiler
     subdir_done()
 endif
 
-disable_apps = ',' + get_option('disable_apps')
-disable_apps = run_command(list_dir_globs, disable_apps, check: true).stdout().split()
-
-enable_apps = ',' + get_option('enable_apps')
-enable_apps = run_command(list_dir_globs, enable_apps, check: true).stdout().split()
-if enable_apps.length() == 0
-    enable_apps = run_command(list_dir_globs, '*', check: true).stdout().split()
-endif
-
 apps = [
         'dumpcap',
         'pdump',
@@ -41,6 +32,15 @@ if get_option('tests')
     apps += 'test'
 endif
 
+disable_apps = ',' + get_option('disable_apps')
+disable_apps = run_command(list_dir_globs, disable_apps, check: true).stdout().split()
+
+enable_apps = ',' + get_option('enable_apps')
+enable_apps = run_command(list_dir_globs, enable_apps, check: true).stdout().split()
+if enable_apps.length() == 0
+    enable_apps = apps
+endif
+
 default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
 default_ldflags = []
 if get_option('default_library') == 'static' and not is_windows
-- 
2.42.0


  parent reply	other threads:[~2023-09-20 14:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-16 13:15 [PATCH " Ric Li
2023-09-19  8:12 ` Bruce Richardson
2023-09-19 12:19   ` Ric Li
2023-09-20 14:18 ` Ric Li [this message]
2023-09-20 15:07   ` [PATCH v2 " Bruce Richardson
2023-10-11 15:27   ` Thomas Monjalon
2023-10-11 15:34     ` Bruce Richardson
2023-10-24 16:08       ` Ric Li
2024-02-18 13:45         ` Thomas Monjalon
     [not found] ` <20230920141846.2187-1-ricmli@outlook.com>
2023-09-20 14:18   ` [PATCH v2 2/2] doc: add MSYS2 building guide Ric Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=TYAP286MB0300BB597DDFC33CF7D2BA70CCF9A@TYAP286MB0300.JPNP286.PROD.OUTLOOK.COM \
    --to=ricmli@outlook.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).