build: fix building when essential drivers in disable list
PATCH 1/1 build: fix building when essential drivers in disable list
The PCI and vdev bus drivers cannot be disabled for DPDK builds and special logic is put in place to not skip them when they are specified in the disable list. This logic is broken though, as the inclusion of the driver-specific meson.build file is only included in the "else" leg of the condition check. This means that when they are specified as disabled the PCI and vdev buses are not disabled, but neither are their source files compiled.
Fix this by moving the "subdir()" call into the next "if build" block, ensuring that if not disabled the sources are always included. To take account of the fact that the subdir call could itself disable the driver, we add a break call into the following loop to ensure we quickly fall through to the following block which stops processing appropriately if the driver is disabled.
--- drivers/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/meson.build +6 -3
@@ -109,16 +109,19 @@ foreach subpath:subdirs build = false reason = 'explicitly disabled via build config' endif - else - # pull in driver directory which should update all the local variables - subdir(drv_path) endif if build + # pull in driver directory which should update all the local variables + subdir(drv_path) + # get dependency objs from strings shared_deps = ext_deps static_deps = ext_deps foreach d:deps + if not build + break + endif if not is_variable('shared_rte_' + d) build = false reason = 'missing internal dependency, "@0@"'.format(d)
Signature · 1 line
2.30.2
Quoted 15 lines · Bruce Richardson
The PCI and vdev bus drivers cannot be disabled for DPDK builds and special logic is put in place to not skip them when they are specified in the disable list. This logic is broken though, as the inclusion of the driver-specific meson.build file is only included in the "else" leg of the condition check. This means that when they are specified as disabled the PCI and vdev buses are not disabled, but neither are their source files compiled.
Fix this by moving the "
subdir()" call into the next "if build" block, ensuring that if not disabled the sources are always included. To take account of the fact that the subdir call could itself disable the driver, we add a break call into the following loop to ensure we quickly fall through to the following block which stops processing appropriately if the driver is disabled.
Quoted 5 lines
Fixes 2e33309ebe03 ("config: enable/disable drivers in Arm builds")Signed-off-by Bruce Richardson <[email protected]>---
Thomas Monjalon
Applied09/09/2021 15:38, Nicolau, Radu:
Quoted 16 lines · Bruce Richardson
Quoted 15 lines
The PCI and vdev bus drivers cannot be disabled for DPDK builds and special logic is put in place to not skip them when they are specified in the disable list. This logic is broken though, as the inclusion of the driver-specific meson.build file is only included in the "else" leg of the condition check. This means that when they are specified as disabled the PCI and vdev buses are not disabled, but neither are their source files compiled.
Fix this by moving the "
subdir()" call into the next "if build" block, ensuring that if not disabled the sources are always included. To take account of the fact that the subdir call could itself disable the driver, we add a break call into the following loop to ensure we quickly fall through to the following block which stops processing appropriately if the driver is disabled.
Quoted 7 lines
Quoted 5 lines
Fixes 2e33309ebe03 ("config: enable/disable drivers in Arm builds")Signed-off-by Bruce Richardson <[email protected]>---
Tested-by Radu Nicolau <[email protected]>Acked-by Radu Nicolau <[email protected]>
Applied, thanks