From e8fccaea46b9e545282cd37d54b1acb168608a46 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 8 May 2023 15:50:26 +0300 Subject: meson: Fix usage of overwritten pipeline variable When iterating over enabled pipelines and IPA modules, libcamera descends into subdirectories in a recursive manner, which involves nested loops. Both the outer and inner loops use the same loop variable named 'pipeline'. As the outer loop uses the variable after descending into the inner directory, it ends up using an incorrect value. Fix it by moving all use of the variable before the subdir() call, and add a comment that warns about the issue to avoid reintroducing it. Fixes: e8526c0c2bc6 ("ipa: meson: Allow nested IPA directory structures") Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Umang Jain --- src/ipa/meson.build | 5 ++++- src/libcamera/pipeline/meson.build | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 289f861c..903eb52b 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -52,8 +52,11 @@ foreach pipeline : pipelines continue endif - subdir(pipeline) subdirs += pipeline + subdir(pipeline) + + # Don't reuse the pipeline variable below, the subdirectory may have + # overwritten it. endforeach # The ipa-sign-install.sh script which uses the enabled_ipa_modules variable diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build index b6160d34..8a61991c 100644 --- a/src/libcamera/pipeline/meson.build +++ b/src/libcamera/pipeline/meson.build @@ -12,6 +12,9 @@ foreach pipeline : pipelines continue endif - subdir(pipeline) subdirs += pipeline + subdir(pipeline) + + # Don't reuse the pipeline variable below, the subdirectory may have + # overwritten it. endforeach -- cgit v1.2.1