diff mbox series

[v11,01/15] crypto/armv8: replace meson option with pkg-config support

Message ID 1605267483-13167-2-git-send-email-juraj.linkes@pantheon.tech (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series Arm build options rework |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Juraj Linkeš Nov. 13, 2020, 11:37 a.m. UTC 
  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 mbox series

Patch

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>',