From 77d2bdb0a274d3bfccb63585c313ff7033a5656b Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 15 Aug 2021 02:14:41 -0700 Subject: [PATCH] pps: Avoid duplicate elements in with_datasources array. Setting -Dperfetto=true and -Ddatasources=intel,panfrost to the meson command line resulted in duplicate elements. Fixes: 92180a43763 ("pps: Intel pps driver") Fixes: 513d1baaea5 ("pps: Panfrost pps driver") Signed-off-by: Vinson Lee Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/ds/meson.build | 4 +++- src/panfrost/ds/meson.build | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/intel/ds/meson.build b/src/intel/ds/meson.build index 411d5860a55..0da1a162c6d 100644 --- a/src/intel/ds/meson.build +++ b/src/intel/ds/meson.build @@ -27,4 +27,6 @@ pps_intel_dep = declare_dependency( ) pps_datasources += pps_intel_dep -with_datasources += 'intel' +if not with_datasources.contains('intel') + with_datasources += 'intel' +endif diff --git a/src/panfrost/ds/meson.build b/src/panfrost/ds/meson.build index a31a71561f2..379a25c4d26 100644 --- a/src/panfrost/ds/meson.build +++ b/src/panfrost/ds/meson.build @@ -28,4 +28,6 @@ pps_panfrost_dep = declare_dependency( ) pps_datasources += pps_panfrost_dep -with_datasources += 'panfrost' +if not with_datasources.contains('panfrost') + with_datasources += 'panfrost' +endif