From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9DE81A09DE;
Fri, 13 Nov 2020 12:38:31 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id E452AC876;
Fri, 13 Nov 2020 12:38:12 +0100 (CET)
Received: from lb.pantheon.sk (lb.pantheon.sk [46.229.239.20])
by dpdk.org (Postfix) with ESMTP id 6A13923D
for <dev@dpdk.org>; Fri, 13 Nov 2020 12:38:10 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
by lb.pantheon.sk (Postfix) with ESMTP id 326CCB9309;
Fri, 13 Nov 2020 12:38:06 +0100 (CET)
X-Virus-Scanned: amavisd-new at siecit.sk
Received: from lb.pantheon.sk ([127.0.0.1])
by localhost (lb.pantheon.sk [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id Tviy_9Ddrbmi; Fri, 13 Nov 2020 12:38:05 +0100 (CET)
Received: from service-node1.lab.pantheon.local (unknown [46.229.239.141])
by lb.pantheon.sk (Postfix) with ESMTP id 00BC4B92E2;
Fri, 13 Nov 2020 12:38:04 +0100 (CET)
From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>
To: bruce.richardson@intel.com, Ruifeng.Wang@arm.com,
Honnappa.Nagarahalli@arm.com, Phil.Yang@arm.com, vcchunga@amazon.com,
Dharmik.Thakkar@arm.com, jerinjacobk@gmail.com, hemant.agrawal@nxp.com,
ajit.khaparde@broadcom.com, ferruh.yigit@intel.com
Cc: dev@dpdk.org,
Dharmik Thakkar <dharmik.thakkar@arm.com>
Date: Fri, 13 Nov 2020 12:37:49 +0100
Message-Id: <1605267483-13167-2-git-send-email-juraj.linkes@pantheon.tech>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1605267483-13167-1-git-send-email-juraj.linkes@pantheon.tech>
References: <1605265789-12932-1-git-send-email-juraj.linkes@pantheon.tech>
<1605267483-13167-1-git-send-email-juraj.linkes@pantheon.tech>
Subject: [dpdk-dev] [PATCH v11 01/15] crypto/armv8: replace meson option
with pkg-config support
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
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
Sender: "dev" <dev-bounces@dpdk.org>
From: Dharmik Thakkar <dharmik.thakkar@arm.com>
With pkg-config support available within AArch64crypto library,
meson option 'armv8_crypto_dir' can be removed.
PKG_CONFIG_PATH environment variable should be set appropriately
to use the crypto library.
Suggested-by: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
doc/guides/cryptodevs/armv8.rst | 10 ++++++++--
drivers/crypto/armv8/meson.build | 19 ++++---------------
meson_options.txt | 2 --
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst
index f0f30fe00..8963f66a2 100644
--- a/doc/guides/cryptodevs/armv8.rst
+++ b/doc/guides/cryptodevs/armv8.rst
@@ -37,11 +37,17 @@ To build DPDK with this virtual crypto PMD, the user is required to:
make
-* Build DPDK with meson option ``-Darmv8_crypto_dir=<path_to_AArch64cryptolib>``:
+* Add path to `libAArch64crypto.pc` in `PKG_CONFIG_PATH` environment variable:
.. code-block:: console
- meson -Darmv8_crypto_dir=<path_to_AArch64cryptolib> build
+ export PKG_CONFIG_PATH=<path_to_AArch64cryptolib>/pkgconfig/:$PKG_CONFIG_PATH
+
+* Build DPDK:
+
+.. code-block:: console
+
+ meson build
ninja -C build
The corresponding device can be created only if the following features
diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index c445c5bd3..3289a2adc 100644
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build
@@ -1,24 +1,13 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2019 Arm Limited
-path = get_option('armv8_crypto_dir')
-if path == ''
+dep = dependency('libAArch64crypto', required: false)
+if not dep.found()
build = false
- reason = 'missing dependency, "armv8_crypto"'
+ reason = 'missing dependency, "libAArch64crypto"'
subdir_done()
endif
-inc_dir = path
-
-lib = cc.find_library('libAArch64crypto', dirs: [path], required: false)
-if not lib.found()
- build = false
- reason = 'missing dependency, "AArch64crypto"'
- subdir_done()
-else
- ext_deps += lib
- includes += include_directories(inc_dir)
-endif
-
+ext_deps += dep
deps += ['bus_vdev']
sources = files('rte_armv8_pmd.c', 'rte_armv8_pmd_ops.c')
diff --git a/meson_options.txt b/meson_options.txt
index 9bf18ab6b..e384e6dbb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,5 @@
# Please keep these options sorted alphabetically.
-option('armv8_crypto_dir', type: 'string', value: '',
- description: 'path to the armv8_crypto library installation directory')
option('disable_drivers', type: 'string', value: '',
description: 'Comma-separated list of drivers to explicitly disable.')
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
--
2.20.1