From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [RFCv2 12/40] build: generalize net driver build to higher level
Date: Mon, 14 Aug 2017 10:51:40 +0100 [thread overview]
Message-ID: <20170814095208.166496-13-bruce.richardson@intel.com> (raw)
In-Reply-To: <20170814095208.166496-1-bruce.richardson@intel.com>
Move the logic for generating the pmdinfo file and the driver library
itself to the meson.build file at the driver/net level, to avoid
duplicating code.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/i40e/base/meson.build | 2 +-
drivers/net/i40e/meson.build | 31 ++++---------------------
drivers/net/meson.build | 48 ++++++++++++++++++++++++++++++++++++++-
3 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 43399cb11..69f55497e 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -43,7 +43,7 @@ error_cflags = ['-Wno-sign-compare',
'-Wno-unused-value',
'-Wno-format',
'-Wno-unused-but-set-variable']
-c_args = i40e_cflags
+c_args = cflags
foreach flag: error_cflags
if cc.has_argument(flag)
c_args += flag
diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index 7d103868d..4652b8ac9 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -29,12 +29,13 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-i40e_cflags = ['-DPF_DRIVER',
+cflags = ['-DPF_DRIVER',
'-DVF_DRIVER',
'-DINTEGRATED_VF',
'-DX722_A0_SUPPORT']
subdir('base')
+libs = [base_lib]
sources = files(
'i40e_ethdev.c',
@@ -56,31 +57,7 @@ if arch_subdir == 'x86'
sources += files('i40e_rxtx_vec_sse.c')
endif
-install_headers('rte_pmd_i40e.h')
-
-pmdinfogen_srcs = run_command('grep', '--files-with-matches',
- 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
-foreach src: pmdinfogen_srcs
- out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
- tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
- src, include_directories: include_directories('base'),
- dependencies: deps,
- c_args: i40e_cflags)
- sources += custom_target(out_filename,
- command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
- output: out_filename,
- depends: [pmdinfogen, tmp_lib])
-endforeach
+includes = include_directories('base', '.')
-i40e_lib = library('rte_pmd_i40e', sources,
- include_directories: include_directories('base'),
- dependencies: deps,
- link_with: base_lib,
- c_args: i40e_cflags,
- install: true,
- install_dir: 'dpdk/drivers')
-
-dpdk_drivers += i40e_lib
+install_headers('rte_pmd_i40e.h')
-i40e_pmd = declare_dependency(link_with: i40e_lib,
- include_directories: include_directories('.'))
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 22237b1aa..db242d71b 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -29,4 +29,50 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-subdir('i40e')
+drivers = ['i40e']
+
+foreach drv:drivers
+ dpdk_conf.set('RTE_LIBRTE_@0@_PMD'.format(drv.to_upper()),1)
+
+ # set up empty variables used for build
+ sources = []
+ libs = []
+ cflags = []
+ deps = []
+ includes = []
+
+ # pull in driver directory which should assign to each of the above
+ subdir(drv)
+
+ # generate pmdinfo sources
+ pmdinfogen_srcs = run_command('grep', '--files-with-matches',
+ 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
+ foreach src: pmdinfogen_srcs
+ out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
+ tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
+ src, include_directories: includes,
+ dependencies: deps,
+ c_args: cflags)
+ sources += custom_target(out_filename,
+ command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
+ output: out_filename,
+ depends: [pmdinfogen, tmp_lib])
+ endforeach
+
+ # now build the driver itself, and add to the drivers list
+ lib = library('rte_pmd_@0@'.format(drv), sources,
+ include_directories: includes,
+ dependencies: deps,
+ link_with: libs,
+ c_args: cflags,
+ install: true,
+ install_dir: driver_install_path)
+
+ dpdk_drivers += lib
+
+ # create a dependency object and add it to the global dictionary so
+ # testpmd or other built-in apps can find it if necessary
+ set_variable('dep_pmd_@0@'.format(drv),
+ declare_dependency(link_with: lib,
+ include_directories: includes))
+endforeach
--
2.13.4
next prev parent reply other threads:[~2017-08-14 10:03 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 9:51 [dpdk-dev] [RFCv2 00/40] Building DPDK with meson and ninja Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 01/40] build: initial hooks for using meson with DPDK Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 02/40] build: create pkg-config file for DPDK Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 03/40] build: build linuxapp EAL with meson and ninja Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 04/40] build: add EAL support under BSD Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 05/40] build: add core libraries to meson build system Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 06/40] build: add i40e driver to meson build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 07/40] build: add pmdinfogen to build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 08/40] build: generate list of sources for pmdinfogen Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 09/40] build: build i40e driver, including pmdinfo Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 10/40] build: install usertools scripts Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 11/40] build: simplify generation of pmd.c files Bruce Richardson
2017-08-14 9:51 ` Bruce Richardson [this message]
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 13/40] build: remove hard-coded enablement of vector driver Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 14/40] build: add ixgbe driver to build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 15/40] build: set up standard deps for drivers Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 16/40] build: add af_packet driver to build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 17/40] build: add pcap PMD support Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 18/40] build: add symbol version map file support to libs Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 19/40] build: build libraries in a loop for brevity Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 20/40] build: version library .so files Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 21/40] eal: add version information to meson build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 22/40] build: add mempool drivers to build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 23/40] build: add gro library to meson build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 24/40] build: tweak naming of pmd dependencies Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 25/40] build: track driver include directories properly Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 26/40] metrics: add metrics lib to meson build Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 27/40] build: track dependencies recursively Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 28/40] testpmd: compile testpmd with meson and ninja Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 29/40] crypto/null: rename the version file to standard Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 30/40] crypto/qat: remove dependency on ether library Bruce Richardson
2017-08-14 9:51 ` [dpdk-dev] [RFCv2 31/40] build: add cryptodev and some crypto drivers to build Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 32/40] igb_uio: add igb_uio to meson build Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 33/40] ip_frag: rename version file to standard name Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 34/40] build: add most remaining libraries to meson build Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 35/40] build: add packet framework libs " Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 36/40] acl: add acl library " Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 37/40] build: add ark and avp PMDs to build Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 38/40] build: fix static library builds with base code Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 39/40] build: fix driver dependencies for static builds Bruce Richardson
2017-08-14 9:52 ` [dpdk-dev] [RFCv2 40/40] examples: allow basic sample app build using pkg-config Bruce Richardson
2017-08-15 10:56 ` [dpdk-dev] [RFCv2 00/40] Building DPDK with meson and ninja Luca Boccassi
2017-08-15 11:31 ` Bruce Richardson
2017-08-17 14:10 ` Marco Varlese
2017-08-17 15:25 ` Luca Boccassi
2017-08-18 8:35 ` Bruce Richardson
2017-08-18 8:52 ` Marco Varlese
2017-08-18 9:17 ` Marco Varlese
2017-08-18 9:33 ` Luca Boccassi
[not found] ` <1502983469.31476.3.camel@gmail.com>
2017-08-18 8:00 ` Marco Varlese
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=20170814095208.166496-13-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/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).