From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id B1B6742D80;
Wed, 28 Jun 2023 15:21:44 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9F3EF42BDA;
Wed, 28 Jun 2023 15:21:44 +0200 (CEST)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.129.124])
by mails.dpdk.org (Postfix) with ESMTP id D636142BC9
for <dev@dpdk.org>; Wed, 28 Jun 2023 15:21:43 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1687958503;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=Rrefn73wQrzzFjj5z/aIHwvbq0GjQDSlqYRQo2xQpBc=;
b=NXcEQZJpYRzuw3LtvOaNPyD3YD5o3eU8CSFdUWszJUrEkkwNMNnUGOQ0rpYE99CK3QkGhp
14MNJ9v2vCLos4q3FYtbU8qF8iQa/GQS7KCz4s61ePjAsgBA/GK7/8fpPljRUhv+pD1OJW
MLpaiDZUfcW/VGWeS83UYMKj6Yzbrx4=
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
[66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-191-52XZTSdZMQmynIrJR6z5Vg-1; Wed, 28 Jun 2023 09:21:37 -0400
X-MC-Unique: 52XZTSdZMQmynIrJR6z5Vg-1
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
[10.11.54.3])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 02D6F385558B;
Wed, 28 Jun 2023 13:20:13 +0000 (UTC)
Received: from dmarchan.redhat.com (unknown [10.45.224.210])
by smtp.corp.redhat.com (Postfix) with ESMTP id 1F10C111F3B6;
Wed, 28 Jun 2023 13:20:10 +0000 (UTC)
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, bluca@debian.org, tredaelli@redhat.com,
i.maximets@ovn.org, james.r.harris@intel.com, mohammed@hawari.fr,
Aaron Conole <aconole@redhat.com>,
Michael Santana <maicolgabriel@hotmail.com>,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH v5 1/2] build: select deprecated libraries
Date: Wed, 28 Jun 2023 15:20:03 +0200
Message-Id: <20230628132004.340074-2-david.marchand@redhat.com>
In-Reply-To: <20230628132004.340074-1-david.marchand@redhat.com>
References: <20211117112847.7362-6-david.marchand@redhat.com>
<20230628132004.340074-1-david.marchand@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"; x-default=true
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Rework deprecated libraries selection by introducing a new configuration
option.
This breaks existing configurations that were relying on disable_libs=''
for enabling deprecated libraries.
On the other hand, it will make enabling optional libraries more
straightforward by taking the deprecated libraries out of the picture.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
Changes since v4:
- changed the option to a list of libraries instead of a global on/off
knob,
- moved all deprecated libs checks under a single block for readability,
---
.ci/linux-build.sh | 2 +-
devtools/test-meson-builds.sh | 8 ++++----
lib/meson.build | 28 ++++++++++++++++++++--------
meson_options.txt | 4 +++-
4 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 45f2729996..e0b62bac90 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -97,7 +97,7 @@ if [ "$MINI" = "true" ]; then
OPTS="$OPTS -Denable_drivers=net/null"
OPTS="$OPTS -Ddisable_libs=*"
else
- OPTS="$OPTS -Ddisable_libs="
+ OPTS="$OPTS -Denable_deprecated_libs=*"
fi
OPTS="$OPTS -Dlibdir=lib"
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 84b907d2ea..c41659d28b 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -120,10 +120,10 @@ 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="
+ # deprecated libs are disabled by default, so for complete builds
+ # enable them
+ if ! echo $* | grep -q -- 'enable_deprecated_libs' ; then
+ options="$options -Denable_deprecated_libs=*"
fi
if echo $* | grep -qw -- '--default-library=shared' ; then
options="$options -Dexamples=all"
diff --git a/lib/meson.build b/lib/meson.build
index fac2f52cad..73afd90b38 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -93,6 +93,15 @@ dpdk_libs_deprecated += [
'kni',
]
+enable_deprecated_libs = []
+foreach l:run_command(list_dir_globs, get_option('enable_deprecated_libs'),
+ check: true).stdout().split()
+ if not dpdk_libs_deprecated.contains(l)
+ continue
+ endif
+ enable_deprecated_libs += l
+endforeach
+
disabled_libs = []
opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs'),
check: true).stdout().split()
@@ -137,16 +146,19 @@ foreach l:libraries
deps += ['eal']
endif
- if disabled_libs.contains(l)
- build = false
- reason = 'explicitly disabled via build config'
- if dpdk_libs_deprecated.contains(l)
- reason += ' (deprecated lib)'
- endif
- else
- if dpdk_libs_deprecated.contains(l)
+ if dpdk_libs_deprecated.contains(l)
+ if not enable_deprecated_libs.contains(l)
+ build = false
+ reason = 'not in enabled deprecated libraries build config'
+ else
warning('Enabling deprecated library, "@0@"'.format(l))
endif
+ elif disabled_libs.contains(l)
+ build = false
+ reason = 'explicitly disabled via build config'
+ endif
+
+ if build
subdir(l)
endif
if name != l
diff --git a/meson_options.txt b/meson_options.txt
index 82c8297065..839d4266c6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,7 +10,7 @@ option('disable_apps', type: 'string', value: '', description:
'Comma-separated list of apps to explicitly disable.')
option('disable_drivers', type: 'string', value: '', description:
'Comma-separated list of drivers to explicitly disable.')
-option('disable_libs', type: 'string', value: 'flow_classify,kni', description:
+option('disable_libs', type: 'string', value: '', description:
'Comma-separated list of libraries to explicitly disable. [NOTE: not all libs can be disabled]')
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
@@ -18,6 +18,8 @@ option('enable_docs', type: 'boolean', value: false, description:
'build documentation')
option('enable_apps', type: 'string', value: '', description:
'Comma-separated list of apps to build. If unspecified, build all apps.')
+option('enable_deprecated_libs', type: 'string', value: '', description:
+ 'Comma-separated list of deprecated libraries to explicitly enable.')
option('enable_drivers', type: 'string', value: '', description:
'Comma-separated list of drivers to build. If unspecified, build all drivers.')
option('enable_driver_sdk', type: 'boolean', value: false, description:
--
2.40.1