From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 0F2031B9A3 for ; Fri, 19 Apr 2019 12:01:25 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2019 03:01:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,369,1549958400"; d="scan'208";a="132688549" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga007.jf.intel.com with ESMTP; 19 Apr 2019 03:01:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com, declan.doherty@intel.com, Bruce Richardson Date: Fri, 19 Apr 2019 11:01:12 +0100 Message-Id: <20190419100113.31284-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 1/2] crypto/aesni_gcm: add dependency version check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Apr 2019 10:01:26 -0000 The aesni_mb driver and the aesni_gcm driver both require the same version of the IPSec_MB library, but only the former has a check of the library found to see if it's the correct version. Add a similar check to the aesni_gcm library's meson.build file, so that the auto-detection of dependencies works correctly. Signed-off-by: Bruce Richardson --- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build index 70f57ad73..7183cfcba 100644 --- a/drivers/crypto/aesni_gcm/meson.build +++ b/drivers/crypto/aesni_gcm/meson.build @@ -1,11 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib + + # version comes with quotes, so we split based on " and take the middle + imb_ver = cc.get_define('IMB_VERSION_STR', + prefix : '#include').split('"')[1] + + if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)) + message('IPSec_MB version >= @0@ is required, found version @1@'.format( + IMB_required_ver, imb_ver)) + build = false + endif endif allow_experimental_apis = true -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 9C9DAA00E6 for ; Fri, 19 Apr 2019 12:01:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 439131BB21; Fri, 19 Apr 2019 12:01:27 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 0F2031B9A3 for ; Fri, 19 Apr 2019 12:01:25 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2019 03:01:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,369,1549958400"; d="scan'208";a="132688549" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga007.jf.intel.com with ESMTP; 19 Apr 2019 03:01:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com, declan.doherty@intel.com, Bruce Richardson Date: Fri, 19 Apr 2019 11:01:12 +0100 Message-Id: <20190419100113.31284-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 1/2] crypto/aesni_gcm: add dependency version check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190419100112.Rpzmqu6_Nt8B-BqXcNSGYgQdruNUyj45Ou4uLdNRAqc@z> The aesni_mb driver and the aesni_gcm driver both require the same version of the IPSec_MB library, but only the former has a check of the library found to see if it's the correct version. Add a similar check to the aesni_gcm library's meson.build file, so that the auto-detection of dependencies works correctly. Signed-off-by: Bruce Richardson --- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build index 70f57ad73..7183cfcba 100644 --- a/drivers/crypto/aesni_gcm/meson.build +++ b/drivers/crypto/aesni_gcm/meson.build @@ -1,11 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib + + # version comes with quotes, so we split based on " and take the middle + imb_ver = cc.get_define('IMB_VERSION_STR', + prefix : '#include').split('"')[1] + + if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)) + message('IPSec_MB version >= @0@ is required, found version @1@'.format( + IMB_required_ver, imb_ver)) + build = false + endif endif allow_experimental_apis = true -- 2.20.1