From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 54F472BF4 for ; Mon, 25 Mar 2019 11:35:00 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Mar 2019 03:34:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,256,1549958400"; d="scan'208";a="125640712" Received: from silpixa00380299.ir.intel.com (HELO silpixa00380299.ger.corp.intel.com) ([10.237.223.68]) by orsmga007.jf.intel.com with ESMTP; 25 Mar 2019 03:34:58 -0700 From: Andrius Sirvys To: dev@dpdk.org Cc: bruce.richardson@intel.com, Andrius Sirvys Date: Mon, 25 Mar 2019 10:34:59 +0000 Message-Id: <20190325103459.3228-1-andrius.sirvys@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <1551958101-104223-1-git-send-email-andrius.sirvys@intel.com> References: <1551958101-104223-1-git-send-email-andrius.sirvys@intel.com> Subject: [dpdk-dev] [PATCH v5] build: move variable definition to top level 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: , X-List-Received-Date: Mon, 25 Mar 2019 10:35:00 -0000 If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories. In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables. Signed-off-by: Andrius Sirvys Acked-by: Bruce Richardson --- v5: Rebased off of master branch --- drivers/meson.build | 4 ++-- meson.build | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 69d0556d3..8c76a5659 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation # Defines the order in which the drivers are buit. -driver_classes = ['common', +dpdk_driver_classes = ['common', 'bus', 'mempool', # depends on common and bus. 'net', # depends on common, bus and mempool. @@ -20,7 +20,7 @@ endif # specify -D_GNU_SOURCE unconditionally default_cflags += '-D_GNU_SOURCE' -foreach class:driver_classes +foreach class:dpdk_driver_classes drivers = [] std_deps = [] config_flag_fmt = '' # format string used to set the value in dpdk_conf diff --git a/meson.build b/meson.build index 69833de82..e945a27c3 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,7 @@ cc = meson.get_compiler('c') dpdk_conf = configuration_data() dpdk_libraries = [] dpdk_static_libraries = [] +dpdk_driver_classes = [] dpdk_drivers = [] dpdk_extra_ldflags = [] dpdk_app_link_libraries = [] @@ -105,7 +106,7 @@ endforeach message(output_message + '\n') output_message = '\n===============\nDrivers Enabled\n===============\n' -foreach class:driver_classes +foreach class:dpdk_driver_classes class_drivers = get_variable(class + '_drivers') output_message += '\n' + class + ':\n\t' output_count = 0 -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 613E0A05D3 for ; Mon, 25 Mar 2019 11:35:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 04D2D2BF7; Mon, 25 Mar 2019 11:35:02 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 54F472BF4 for ; Mon, 25 Mar 2019 11:35:00 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Mar 2019 03:34:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,256,1549958400"; d="scan'208";a="125640712" Received: from silpixa00380299.ir.intel.com (HELO silpixa00380299.ger.corp.intel.com) ([10.237.223.68]) by orsmga007.jf.intel.com with ESMTP; 25 Mar 2019 03:34:58 -0700 From: Andrius Sirvys To: dev@dpdk.org Cc: bruce.richardson@intel.com, Andrius Sirvys Date: Mon, 25 Mar 2019 10:34:59 +0000 Message-Id: <20190325103459.3228-1-andrius.sirvys@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <1551958101-104223-1-git-send-email-andrius.sirvys@intel.com> References: <1551958101-104223-1-git-send-email-andrius.sirvys@intel.com> Subject: [dpdk-dev] [PATCH v5] build: move variable definition to top level 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" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190325103459.G1W2Yj3U072-NzTkJyBKVYkoH17EpHLmPGuymuwd-2g@z> If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories. In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables. Signed-off-by: Andrius Sirvys Acked-by: Bruce Richardson --- v5: Rebased off of master branch --- drivers/meson.build | 4 ++-- meson.build | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 69d0556d3..8c76a5659 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation # Defines the order in which the drivers are buit. -driver_classes = ['common', +dpdk_driver_classes = ['common', 'bus', 'mempool', # depends on common and bus. 'net', # depends on common, bus and mempool. @@ -20,7 +20,7 @@ endif # specify -D_GNU_SOURCE unconditionally default_cflags += '-D_GNU_SOURCE' -foreach class:driver_classes +foreach class:dpdk_driver_classes drivers = [] std_deps = [] config_flag_fmt = '' # format string used to set the value in dpdk_conf diff --git a/meson.build b/meson.build index 69833de82..e945a27c3 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,7 @@ cc = meson.get_compiler('c') dpdk_conf = configuration_data() dpdk_libraries = [] dpdk_static_libraries = [] +dpdk_driver_classes = [] dpdk_drivers = [] dpdk_extra_ldflags = [] dpdk_app_link_libraries = [] @@ -105,7 +106,7 @@ endforeach message(output_message + '\n') output_message = '\n===============\nDrivers Enabled\n===============\n' -foreach class:driver_classes +foreach class:dpdk_driver_classes class_drivers = get_variable(class + '_drivers') output_message += '\n' + class + ':\n\t' output_count = 0 -- 2.17.1