From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B4A14A09D3; Thu, 12 Nov 2020 10:43:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CCBE272F0; Thu, 12 Nov 2020 10:42:29 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 9B5886CAB for ; Thu, 12 Nov 2020 10:42:26 +0100 (CET) IronPort-SDR: 07yl174mK11w5eVpdP95lnLbrXuNwbxYpGmd5XuQbAQ1O8B7u2VSiL1jwj+3iiY5sEAAfN7Awv 20fGmDhn4NIg== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="166776722" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="166776722" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2020 01:42:24 -0800 IronPort-SDR: z45q56Wlp1YI8nVD0LITlEXKZHvrUm9FE9tKDTWd1OLUfOFcs0e2zYBRiOQvNnTA+PTwNxlJ6F sphnVFUbSJRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="339347937" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by orsmga002.jf.intel.com with ESMTP; 12 Nov 2020 01:42:23 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson Date: Thu, 12 Nov 2020 09:41:41 +0000 Message-Id: <20201112094142.1781861-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112094142.1781861-1-bruce.richardson@intel.com> References: <20201110170809.1309043-1-bruce.richardson@intel.com> <20201112094142.1781861-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 3/4] examples: stop processing build file if build is impossible X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Once it has been determined that an example cannot be built, there is little point in continuing to process the meson.build file for that example, so we can use subdir_done() to return to the calling file. This can potentially prevent problems where later statement in the file may cause an error on systems where the app cannot be built, e.g. on Windows or FreeBSD. Signed-off-by: Bruce Richardson --- examples/distributor/meson.build | 3 +++ examples/ethtool/meson.build | 4 ++++ examples/ioat/meson.build | 3 +++ examples/ip_pipeline/meson.build | 4 ++++ examples/kni/meson.build | 4 ++++ examples/l2fwd-cat/meson.build | 4 ++++ examples/ntb/meson.build | 2 ++ examples/performance-thread/l3fwd-thread/meson.build | 4 ++++ examples/performance-thread/pthread_shim/meson.build | 4 ++++ examples/pipeline/meson.build | 4 ++++ examples/vdpa/meson.build | 2 ++ examples/vhost/meson.build | 2 ++ examples/vhost_blk/meson.build | 2 ++ examples/vhost_crypto/meson.build | 4 ++++ 14 files changed, 46 insertions(+) diff --git a/examples/distributor/meson.build b/examples/distributor/meson.build index 5244cd4ff..d8dbc235f 100644 --- a/examples/distributor/meson.build +++ b/examples/distributor/meson.build @@ -8,6 +8,9 @@ # require the power library build = dpdk_conf.has('RTE_LIB_POWER') +if not build + subdir_done() +endif allow_experimental_apis = true deps += ['distributor', 'power'] diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build index cc8edac3d..4d08bc4c5 100644 --- a/examples/ethtool/meson.build +++ b/examples/ethtool/meson.build @@ -7,6 +7,10 @@ # DPDK instance, use 'make' build = is_linux +if not build + subdir_done() +endif + sources = files('lib/rte_ethtool.c', 'ethtool-app/ethapp.c', 'ethtool-app/main.c') diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build index 6afbaa680..e348196ba 100644 --- a/examples/ioat/meson.build +++ b/examples/ioat/meson.build @@ -8,6 +8,9 @@ allow_experimental_apis = true build = dpdk_conf.has('RTE_RAW_IOAT') +if not build + subdir_done() +endif deps += ['raw_ioat'] diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build index 664223c97..945e28b58 100644 --- a/examples/ip_pipeline/meson.build +++ b/examples/ip_pipeline/meson.build @@ -7,6 +7,10 @@ # DPDK instance, use 'make' build = cc.has_header('sys/epoll.h') +if not build + subdir_done() +endif + deps += ['pipeline', 'bus_pci'] allow_experimental_apis = true sources = files( diff --git a/examples/kni/meson.build b/examples/kni/meson.build index 58639b139..e119eebab 100644 --- a/examples/kni/meson.build +++ b/examples/kni/meson.build @@ -8,6 +8,10 @@ # this app can be built if-and-only-if KNI library is buildable build = dpdk_conf.has('RTE_LIB_KNI') +if not build + subdir_done() +endif + deps += ['kni', 'bus_pci'] sources = files( 'main.c' diff --git a/examples/l2fwd-cat/meson.build b/examples/l2fwd-cat/meson.build index 2bed18e74..60169bcbd 100644 --- a/examples/l2fwd-cat/meson.build +++ b/examples/l2fwd-cat/meson.build @@ -8,6 +8,10 @@ pqos = cc.find_library('pqos', required: false) build = pqos.found() +if not build + subdir_done() +endif + ext_deps += pqos allow_experimental_apis = true cflags += '-I/usr/local/include' # assume pqos lib installed in /usr/local diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build index b0201f68b..02be9fc80 100644 --- a/examples/ntb/meson.build +++ b/examples/ntb/meson.build @@ -9,7 +9,9 @@ allow_experimental_apis = true if not is_linux build = false + subdir_done() endif + deps += 'rawdev' cflags += ['-D_FILE_OFFSET_BITS=64'] sources = files( diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build index 99de24be7..4858b201e 100644 --- a/examples/performance-thread/l3fwd-thread/meson.build +++ b/examples/performance-thread/l3fwd-thread/meson.build @@ -7,6 +7,10 @@ # DPDK instance, use 'make' build = dpdk_conf.has('RTE_ARCH_X86_64') +if not build + subdir_done() +endif + deps += ['timer', 'lpm'] allow_experimental_apis = true diff --git a/examples/performance-thread/pthread_shim/meson.build b/examples/performance-thread/pthread_shim/meson.build index 26ef78635..d49979930 100644 --- a/examples/performance-thread/pthread_shim/meson.build +++ b/examples/performance-thread/pthread_shim/meson.build @@ -7,6 +7,10 @@ # DPDK instance, use 'make' build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') +if not build + subdir_done() +endif + deps += ['timer'] allow_experimental_apis = true diff --git a/examples/pipeline/meson.build b/examples/pipeline/meson.build index e47d483de..4f5925d7c 100644 --- a/examples/pipeline/meson.build +++ b/examples/pipeline/meson.build @@ -7,6 +7,10 @@ # DPDK instance, use 'make' build = cc.has_header('sys/epoll.h') +if not build + subdir_done() +endif + deps += ['pipeline', 'bus_pci'] allow_experimental_apis = true sources = files( diff --git a/examples/vdpa/meson.build b/examples/vdpa/meson.build index 73f129cd9..26f6089c9 100644 --- a/examples/vdpa/meson.build +++ b/examples/vdpa/meson.build @@ -8,7 +8,9 @@ if not is_linux build = false + subdir_done() endif + deps += 'vhost' allow_experimental_apis = true sources = files( diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build index 24f1f7131..7e5b9d938 100644 --- a/examples/vhost/meson.build +++ b/examples/vhost/meson.build @@ -8,7 +8,9 @@ if not is_linux build = false + subdir_done() endif + deps += 'vhost' allow_experimental_apis = true sources = files( diff --git a/examples/vhost_blk/meson.build b/examples/vhost_blk/meson.build index 857367192..354ba0584 100644 --- a/examples/vhost_blk/meson.build +++ b/examples/vhost_blk/meson.build @@ -8,10 +8,12 @@ if not is_linux build = false + subdir_done() endif if not cc.has_header('linux/virtio_blk.h') build = false + subdir_done() endif deps += 'vhost' diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build index b2c125e2f..403f21098 100644 --- a/examples/vhost_crypto/meson.build +++ b/examples/vhost_crypto/meson.build @@ -7,6 +7,10 @@ # DPDK instance, use 'make' build = dpdk_conf.has('RTE_LIB_VHOST') +if not build + subdir_done() +endif + allow_experimental_apis = true deps += ['vhost', 'cryptodev'] sources = files( -- 2.25.1