diff mbox series

build: fix building when essential drivers in disable list

Message ID 20210818134240.480605-1-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series build: fix building when essential drivers in disable list |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot: build success github build: passed
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-aarch64-unit-testing fail Testing issues
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS

Commit Message

Bruce Richardson Aug. 18, 2021, 1:42 p.m. UTC 
  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.

Fixes: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
Cc: juraj.linkes@pantheon.tech

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/meson.build | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Radu Nicolau Sept. 9, 2021, 1:38 p.m. UTC | #1 
On 8/18/2021 2:42 PM, Bruce Richardson wrote:
> 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.
>
> Fixes: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> Cc: juraj.linkes@pantheon.tech
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Tested-by: Radu Nicolau <radu.nicolau@intel.com>
Acked-by: Radu Nicolau <radu.nicolau@intel.com>
Thomas Monjalon Sept. 15, 2021, 2:07 p.m. UTC | #2 
09/09/2021 15:38, Nicolau, Radu:
> On 8/18/2021 2:42 PM, Bruce Richardson wrote:
> > 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.
> >
> > Fixes: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> > Cc: juraj.linkes@pantheon.tech
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> Tested-by: Radu Nicolau <radu.nicolau@intel.com>
> Acked-by: Radu Nicolau <radu.nicolau@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/meson.build b/drivers/meson.build
index bc6f4f567f..747c93fe9c 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -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)