crypto/scheduler: fix header install with meson
Subsystems (4)
PATCH 1/1 crypto/scheduler: fix header install with meson
The headers variable is only used in lib/meson.build context. For drivers, an explicit install_headers() is necessary.
Reproduced while compiling the l2fwd-crypto example out of meson (which can be done by adding it in devtools/test-meson-builds.sh examples build test).
--- drivers/crypto/scheduler/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/scheduler/meson.build +1 -1
@@ -13,7 +13,7 @@ sources = files( 'scheduler_roundrobin.c', ) -headers = files( +install_headers( 'rte_cryptodev_scheduler.h', 'rte_cryptodev_scheduler_operations.h', )
Signature · 1 line
2.23.0
Quoted 7 lines · David Marchand
The headers variable is only used in
lib/meson.buildcontext. For drivers, an explicitinstall_headers()is necessary.Reproduced while compiling the l2fwd-crypto example out of meson (which can be done by adding it in
devtools/test-meson-builds.shexamples build test).
Quoted 8 lines
Fixes cd2b6458a1cb ("crypto/scheduler: add in meson build")Signed-off-by David Marchand <[email protected]>--- drivers/crypto/scheduler/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Originally I only put the "headers" variable in the "lib" folder meson.build because it was not expected that many drivers should have private headers. However, perhaps it's worthwhile adding it now:
a) because private headers, while not common, are not unusual
b) for consistency and ease of use.
Thoughts?
/Bruce
Quoted 17 lines · Bruce Richardson
Quoted 7 lines · David Marchand
The headers variable is only used in
lib/meson.buildcontext. For drivers, an explicitinstall_headers()is necessary.Reproduced while compiling the l2fwd-crypto example out of meson (which can be done by adding it in
devtools/test-meson-builds.shexamples build test).Quoted 8 lines
Fixes cd2b6458a1cb ("crypto/scheduler: add in meson build")Signed-off-by David Marchand <[email protected]>--- drivers/crypto/scheduler/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 7 lines
Originally I only put the "headers" variable in the "lib" folder meson.build because it was not expected that many drivers should have private headers. However, perhaps it's worthwhile adding it now:
a) because private headers, while not common, are not unusual
b) for consistency and ease of use.Thoughts?
Yep, I can do it in a followup patch now, still looking at your RFC series though.. :-)
Signature · 1 line
David Marchand
Quoted 25 lines · David Marchand
Quoted 23 lines · Bruce Richardson
Quoted 7 lines · David Marchand
The headers variable is only used in
lib/meson.buildcontext. For drivers, an explicitinstall_headers()is necessary.Reproduced while compiling the l2fwd-crypto example out of meson (which can be done by adding it in
devtools/test-meson-builds.shexamples build test).Quoted 8 lines
Fixes cd2b6458a1cb ("crypto/scheduler: add in meson build")Signed-off-by David Marchand <[email protected]>--- drivers/crypto/scheduler/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Originally I only put the "headers" variable in the "lib" folder meson.build because it was not expected that many drivers should have private headers. However, perhaps it's worthwhile adding it now:
a) because private headers, while not common, are not unusual
b) for consistency and ease of use.
Quoted 5 lines
Quoted 1 line
Thoughts?
Yep, I can do it in a followup patch now, still looking at your RFC series though.. :-)
No rush, what we have now has worked reasonably well for the last few years! :-)
If you don't get to it, I can always look at it post-19.11.
Quoted 7 lines · David Marchand
The headers variable is only used in
lib/meson.buildcontext. For drivers, an explicitinstall_headers()is necessary.Reproduced while compiling the l2fwd-crypto example out of meson (which can be done by adding it in
devtools/test-meson-builds.shexamples build test).
Quoted 5 lines
Fixes cd2b6458a1cb ("crypto/scheduler: add in meson build")Signed-off-by David Marchand <[email protected]>---
PATCH v2 1/2 crypto/scheduler: fix header install with meson
In reply to David MarchandThe headers variable is only used in lib/meson.build context. For drivers, an explicit install_headers() is necessary.
Reproduced while compiling the l2fwd-crypto example out of meson (which can be done by adding it in devtools/test-meson-builds.sh examples build test).
--- drivers/crypto/scheduler/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/scheduler/meson.build +1 -1
@@ -13,7 +13,7 @@ sources = files( 'scheduler_roundrobin.c', ) -headers = files( +install_headers( 'rte_cryptodev_scheduler.h', 'rte_cryptodev_scheduler_operations.h', )
Signature · 1 line
2.23.0
PATCH v2 2/2 drivers: add headers install helper
A lot of drivers export headers, reproduce the same facility than for libraries.
--- doc/guides/contributing/coding_style.rst | 3 +++ drivers/baseband/acc100/meson.build | 2 +- drivers/baseband/fpga_5gnr_fec/meson.build | 2 +- drivers/bus/ifpga/meson.build | 2 +- drivers/bus/pci/meson.build | 2 +- drivers/bus/vdev/meson.build | 2 +- drivers/bus/vmbus/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 2 +- drivers/mempool/dpaa2/meson.build | 2 +- drivers/meson.build | 3 +++ drivers/net/avp/meson.build | 2 +- drivers/net/bnxt/meson.build | 2 +- drivers/net/bonding/meson.build | 2 +- drivers/net/dpaa/meson.build | 2 +- drivers/net/dpaa2/meson.build | 2 +- drivers/net/i40e/meson.build | 2 +- drivers/net/ice/meson.build | 2 +- drivers/net/ixgbe/meson.build | 2 +- drivers/net/ring/meson.build | 2 +- drivers/net/softnic/meson.build | 2 +- drivers/net/vhost/meson.build | 2 +- drivers/raw/dpaa2_cmdif/meson.build | 2 +- drivers/raw/dpaa2_qdma/meson.build | 2 +- drivers/raw/ioat/meson.build | 2 +- drivers/raw/ntb/meson.build | 2 +- 25 files changed, 29 insertions(+), 23 deletions(-)
doc/guides/contributing/coding_style.rst +3 -0
@@ -987,5 +987,8 @@ reason sources [mandatory] As above +headers + As above + version As above
drivers/baseband/acc100/meson.build +1 -1
@@ -5,4 +5,4 @@ deps += ['bbdev', 'bus_vdev', 'ring', 'pci', 'bus_pci'] sources = files('rte_acc100_pmd.c') -install_headers('rte_acc100_cfg.h') +headers = files('rte_acc100_cfg.h')
drivers/baseband/fpga_5gnr_fec/meson.build +1 -1
@@ -5,4 +5,4 @@ deps += ['bbdev', 'bus_vdev', 'ring', 'pci', 'bus_pci'] sources = files('rte_fpga_5gnr_fec.c') -install_headers('rte_pmd_fpga_5gnr_fec.h') +headers = files('rte_pmd_fpga_5gnr_fec.h')
drivers/bus/ifpga/meson.build +1 -1
@@ -8,5 +8,5 @@ if is_windows endif deps += ['pci', 'kvargs', 'rawdev'] -install_headers('rte_bus_ifpga.h') +headers = files('rte_bus_ifpga.h') sources = files('ifpga_common.c', 'ifpga_bus.c')
drivers/bus/pci/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation deps += ['pci'] -install_headers('rte_bus_pci.h') +headers = files('rte_bus_pci.h') sources = files('pci_common.c', 'pci_params.c') if is_linux
drivers/bus/vdev/meson.build +1 -1
@@ -3,6 +3,6 @@ sources = files('vdev.c', 'vdev_params.c') -install_headers('rte_bus_vdev.h') +headers = files('rte_bus_vdev.h') deps += ['kvargs']
drivers/bus/vmbus/meson.build +1 -1
@@ -7,7 +7,7 @@ if is_windows endif -install_headers('rte_bus_vmbus.h','rte_vmbus_reg.h') +headers = files('rte_bus_vmbus.h','rte_vmbus_reg.h') sources = files('vmbus_common.c', 'vmbus_channel.c',
drivers/crypto/scheduler/meson.build +1 -1
@@ -13,7 +13,7 @@ sources = files( 'scheduler_roundrobin.c', ) -install_headers( +headers = files( 'rte_cryptodev_scheduler.h', 'rte_cryptodev_scheduler_operations.h', )
drivers/mempool/dpaa2/meson.build +1 -1
@@ -9,4 +9,4 @@ endif deps += ['bus_fslmc'] sources = files('dpaa2_hw_mempool.c') -install_headers('rte_dpaa2_mempool.h') +headers = files('rte_dpaa2_mempool.h')
drivers/meson.build +3 -0
@@ -60,6 +60,7 @@ foreach subpath:subdirs name = drv fmt_name = '' sources = [] + headers = [] objs = [] cflags = default_cflags includes = [include_directories(drv_path)]
@@ -136,6 +137,8 @@ foreach subpath:subdirs dpdk_extra_ldflags += pkgconfig_extra_libs + install_headers(headers) + # generate pmdinfo sources by building a temporary # lib and then running pmdinfogen on the contents of # that lib. The final lib reuses the object files and
drivers/net/avp/meson.build +1 -1
@@ -6,4 +6,4 @@ if not is_linux reason = 'only supported on linux' endif sources = files('avp_ethdev.c') -install_headers('rte_avp_common.h', 'rte_avp_fifo.h') +headers = files('rte_avp_common.h', 'rte_avp_fifo.h')
drivers/net/bnxt/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2018 Intel Corporation # Copyright(c) 2020 Broadcom -install_headers('rte_pmd_bnxt.h') +headers = files('rte_pmd_bnxt.h') includes += include_directories('tf_ulp') includes += include_directories('tf_core')
drivers/net/bonding/meson.build +1 -1
@@ -8,4 +8,4 @@ sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_flow.c deps += 'sched' # needed for rte_bitmap.h deps += ['ip_frag'] -install_headers('rte_eth_bond.h', 'rte_eth_bond_8023ad.h') +headers = files('rte_eth_bond.h', 'rte_eth_bond_8023ad.h')
drivers/net/dpaa/meson.build +1 -1
@@ -18,4 +18,4 @@ if cc.has_argument('-Wno-pointer-arith') cflags += '-Wno-pointer-arith' endif -install_headers('rte_pmd_dpaa.h') +headers = files('rte_pmd_dpaa.h')
drivers/net/dpaa2/meson.build +1 -1
@@ -21,4 +21,4 @@ sources = files('base/dpaa2_hw_dpni.c', includes += include_directories('base', 'mc') -install_headers('rte_pmd_dpaa2.h') +headers = files('rte_pmd_dpaa2.h')
drivers/net/i40e/meson.build +1 -1
@@ -52,4 +52,4 @@ elif arch_subdir == 'arm' sources += files('i40e_rxtx_vec_neon.c') endif -install_headers('rte_pmd_i40e.h') +headers = files('rte_pmd_i40e.h')
drivers/net/ice/meson.build +1 -1
@@ -39,4 +39,4 @@ sources += files('ice_dcf.c', 'ice_dcf_ethdev.c', 'ice_dcf_parent.c') -install_headers('rte_pmd_ice.h') +headers = files('rte_pmd_ice.h')
drivers/net/ixgbe/meson.build +1 -1
@@ -30,4 +30,4 @@ endif includes += include_directories('base') -install_headers('rte_pmd_ixgbe.h') +headers = files('rte_pmd_ixgbe.h')
drivers/net/ring/meson.build +1 -1
@@ -2,4 +2,4 @@ # Copyright(c) 2017 Intel Corporation sources = files('rte_eth_ring.c') -install_headers('rte_eth_ring.h') +headers = files('rte_eth_ring.h')
drivers/net/softnic/meson.build +1 -1
@@ -5,7 +5,7 @@ if not is_linux build = false reason = 'only supported on linux' endif -install_headers('rte_eth_softnic.h') +headers = files('rte_eth_softnic.h') sources = files('rte_eth_softnic_tm.c', 'rte_eth_softnic.c', 'rte_eth_softnic_mempool.c',
drivers/net/vhost/meson.build +1 -1
@@ -4,5 +4,5 @@ build = dpdk_conf.has('RTE_LIB_VHOST') reason = 'missing dependency, DPDK vhost library' sources = files('rte_eth_vhost.c') -install_headers('rte_eth_vhost.h') +headers = files('rte_eth_vhost.h') deps += 'vhost'
drivers/raw/dpaa2_cmdif/meson.build +1 -1
@@ -6,4 +6,4 @@ reason = 'missing dependency, DPDK DPAA2 mempool driver' deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev'] sources = files('dpaa2_cmdif.c') -install_headers('rte_pmd_dpaa2_cmdif.h') +headers = files('rte_pmd_dpaa2_cmdif.h')
drivers/raw/dpaa2_qdma/meson.build +1 -1
@@ -6,4 +6,4 @@ reason = 'missing dependency, DPDK DPAA2 mempool driver' deps += ['rawdev', 'mempool_dpaa2', 'ring', 'kvargs'] sources = files('dpaa2_qdma.c') -install_headers('rte_pmd_dpaa2_qdma.h') +headers = files('rte_pmd_dpaa2_qdma.h')
drivers/raw/ioat/meson.build +1 -1
@@ -14,5 +14,5 @@ deps += ['bus_pci', 'mbuf', 'rawdev'] -install_headers('rte_ioat_rawdev.h', +headers = files('rte_ioat_rawdev.h', 'rte_ioat_rawdev_fns.h')
drivers/raw/ntb/meson.build +1 -1
@@ -5,4 +5,4 @@ deps += ['rawdev', 'mbuf', 'mempool', 'pci', 'bus_pci'] sources = files('ntb.c', 'ntb_hw_intel.c') -install_headers('rte_pmd_ntb.h') +headers = files('rte_pmd_ntb.h')
Signature · 1 line
2.23.0
Re: [dpdk-dev] [PATCH v2 2/2] drivers: add headers install helper
Quoted 6 lines · David Marchand
A lot of drivers export headers, reproduce the same facility than for libraries.
Suggested-by Bruce Richardson <[email protected]>Signed-off-by David Marchand <[email protected]>---
With this patch 2, you don't need patch 1, though.
Re: [dpdk-dev] [PATCH v2 2/2] drivers: add headers install helper
Quoted 11 lines · Bruce Richardson
Quoted 6 lines · David Marchand
A lot of drivers export headers, reproduce the same facility than for libraries.
Suggested-by Bruce Richardson <[email protected]>Signed-off-by David Marchand <[email protected]>---
Acked-by Bruce Richardson <[email protected]>With this patch 2, you don't need patch 1, though.
Yep, my thoughts too.
Patch 1 is mainly for backports so I can send only patch 2 for main and send patch 1 for 18.11 and 19.11 branches.
Kevin, Luca?
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH v2 2/2] drivers: add headers install helper
Quoted 9 lines · David Marchand
Quoted 7 lines · Bruce Richardson
Quoted 6 lines · David Marchand
A lot of drivers export headers, reproduce the same facility than for libraries.
Suggested-by Bruce Richardson <[email protected]>Signed-off-by David Marchand <[email protected]>---
Quoted 8 lines
Quoted 3 lines
Acked-by Bruce Richardson <[email protected]>With this patch 2, you don't need patch 1, though.
Yep, my thoughts too.
Patch 1 is mainly for backports so I can send only patch 2 for main and send patch 1 for 18.11 and 19.11 branches.
Kevin, Luca?
Sounds good to me, thanks.
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [dpdk-dev] [PATCH v2 2/2] drivers: add headers install helper
Quoted 12 lines · Luca Boccassi
Quoted 11 lines · David Marchand
Quoted 9 lines · Bruce Richardson
Quoted 6 lines · David Marchand
A lot of drivers export headers, reproduce the same facility than for libraries.
Suggested-by Bruce Richardson <[email protected]>Signed-off-by David Marchand <[email protected]>---
Acked-by Bruce Richardson <[email protected]>
Quoted 9 lines
Quoted 6 lines
Quoted 1 line
With this patch 2, you don't need patch 1, though.
Yep, my thoughts too.
Patch 1 is mainly for backports so I can send only patch 2 for main and send patch 1 for 18.11 and 19.11 branches.
Kevin, Luca?Sounds good to me, thanks.
+1
Re: [dpdk-dev] [PATCH v2 2/2] drivers: add headers install helper
In reply to Bruce RichardsonQuoted 11 lines · Bruce Richardson
Quoted 6 lines · David Marchand
A lot of drivers export headers, reproduce the same facility than for libraries.
Suggested-by Bruce Richardson <[email protected]>Signed-off-by David Marchand <[email protected]>---
Acked-by Bruce Richardson <[email protected]>With this patch 2, you don't need patch 1, though.
Added a note about this, and only applied patch 2. I will send backports for 18.11 and 19.11.
Thanks.
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH v2 2/2] drivers: add headers install helper
In reply to David MarchandQuoted 42 lines
Subject: [PATCH v2 2/2] drivers: add headers install helper
A lot of drivers export headers, reproduce the same facility than for libraries.
Suggested-by Bruce Richardson <[email protected]>Signed-off-by David Marchand <[email protected]>--- doc/guides/contributing/coding_style.rst | 3 +++ drivers/baseband/acc100/meson.build | 2 +- drivers/baseband/fpga_5gnr_fec/meson.build | 2 +- drivers/bus/ifpga/meson.build | 2 +- drivers/bus/pci/meson.build | 2 +- drivers/bus/vdev/meson.build | 2 +- drivers/bus/vmbus/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 2 +- drivers/mempool/dpaa2/meson.build | 2 +- drivers/meson.build | 3 +++ drivers/net/avp/meson.build | 2 +- drivers/net/bnxt/meson.build | 2 +- drivers/net/bonding/meson.build | 2 +- drivers/net/dpaa/meson.build | 2 +- drivers/net/dpaa2/meson.build | 2 +- drivers/net/i40e/meson.build | 2 +- drivers/net/ice/meson.build | 2 +- drivers/net/ixgbe/meson.build | 2 +- drivers/net/ring/meson.build | 2 +- drivers/net/softnic/meson.build | 2 +- drivers/net/vhost/meson.build | 2 +- drivers/raw/dpaa2_cmdif/meson.build | 2 +- drivers/raw/dpaa2_qdma/meson.build | 2 +- drivers/raw/ioat/meson.build | 2 +- drivers/raw/ntb/meson.build | 2 +- 25 files changed, 29 insertions(+), 23 deletions(-)drivers/bus/ifpga/meson.build +0
-0
drivers/bus/ifpga/meson.build if is_windows · line 12
Quoted 6 lines
drivers/bus/ifpga/meson.build +1
-1@@ -8,5 +8,5 @@ if is_windows endif deps += ['pci', 'kvargs', 'rawdev'] -install_headers('rte_bus_ifpga.h') +headers = files('rte_bus_ifpga.h') sources = files('ifpga_common.c', 'ifpga_bus.c') diff --git