While KNI (or any other deprecated library) may be disabled by default,
for build testing we need it enabled. Therefore explicitly set
"disable_libs" build parameter to empty for any DPDK build where the
value is not being explicitly set by the script.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
V3: Add disable_libs parameter clearing to CI jobs
---
.ci/linux-build.sh | 2 ++
devtools/test-meson-builds.sh | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 06104eca22..14148fef4a 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -107,6 +107,8 @@ OPTS="$OPTS -Dcheck_includes=true"
if [ "$MINI" = "true" ]; then
OPTS="$OPTS -Denable_drivers=net/null"
OPTS="$OPTS -Ddisable_libs=*"
+else
+ OPTS="$OPTS -Ddisable_libs="
fi
if [ "$ASAN" = "true" ]; then
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e20a1c1df3..3a308bc9af 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -109,6 +109,11 @@ config () # <dir> <builddir> <meson options>
return
fi
options=
+ # deprecated libs may be disabled by default, so for complete builds
ensure
+ # no libs are disabled
+ if ! echo $* | grep -q -- 'disable_libs' ; then
+ options="$options -Ddisable_libs="
+ fi
if echo $* | grep -qw -- '--default-library=shared' ; then
options="$options -Dexamples=all"
else
--
2.34.1
