From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id B5E681B442 for ; Tue, 23 Apr 2019 17:44:12 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 08:44:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,386,1549958400"; d="scan'208";a="293854406" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2019 08:44:11 -0700 From: Bruce Richardson To: pablo.de.lara.guarch@intel.com, dev@dpdk.org Cc: Bruce Richardson Date: Tue, 23 Apr 2019 16:43:56 +0100 Message-Id: <20190423154357.29877-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190423154357.29877-1-bruce.richardson@intel.com> References: <20190423154357.29877-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 2/3] crypto/aesni_mb: cleanup of version check code 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: Tue, 23 Apr 2019 15:44:13 -0000 The version check for the IPSec_MB library present in the aesni_gcm library's meson.build file is a little cleaner than that given here, so update this one so that both work identically. While one could use the checks done in the other right now, potentially in future they may have different version dependencies, or may be compiled in different orders, so keep the code duplicated for safety, since it's only a few lines. Signed-off-by: Bruce Richardson Acked-by: Pablo de Lara --- drivers/crypto/aesni_mb/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build index fbc4878af..7c1eb3f86 100644 --- a/drivers/crypto/aesni_mb/meson.build +++ b/drivers/crypto/aesni_mb/meson.build @@ -1,25 +1,25 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -IPSec_MB_ver_0_52 = '0.52.0' + +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib - imb_arr = cc.get_define('IMB_VERSION_STR', - prefix : '#include').split('"') - - imb_ver = ''.join(imb_arr) + # 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('<' + IPSec_MB_ver_0_52)) - message('IPSec_MB version >= 0.52 is required') + 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 - else - sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') endif endif +sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') allow_experimental_apis = true deps += ['bus_vdev'] -- 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 6F92EA05D3 for ; Tue, 23 Apr 2019 17:44:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E28B61B447; Tue, 23 Apr 2019 17:44:16 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id B5E681B442 for ; Tue, 23 Apr 2019 17:44:12 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 08:44:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,386,1549958400"; d="scan'208";a="293854406" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2019 08:44:11 -0700 From: Bruce Richardson To: pablo.de.lara.guarch@intel.com, dev@dpdk.org Cc: Bruce Richardson Date: Tue, 23 Apr 2019 16:43:56 +0100 Message-Id: <20190423154357.29877-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190423154357.29877-1-bruce.richardson@intel.com> References: <20190423154357.29877-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 2/3] crypto/aesni_mb: cleanup of version check code 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: <20190423154356.srYjD43RKUb39c5AxKqdLyyezM4cH8ikACV1pfMOZgs@z> The version check for the IPSec_MB library present in the aesni_gcm library's meson.build file is a little cleaner than that given here, so update this one so that both work identically. While one could use the checks done in the other right now, potentially in future they may have different version dependencies, or may be compiled in different orders, so keep the code duplicated for safety, since it's only a few lines. Signed-off-by: Bruce Richardson Acked-by: Pablo de Lara --- drivers/crypto/aesni_mb/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build index fbc4878af..7c1eb3f86 100644 --- a/drivers/crypto/aesni_mb/meson.build +++ b/drivers/crypto/aesni_mb/meson.build @@ -1,25 +1,25 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -IPSec_MB_ver_0_52 = '0.52.0' + +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib - imb_arr = cc.get_define('IMB_VERSION_STR', - prefix : '#include').split('"') - - imb_ver = ''.join(imb_arr) + # 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('<' + IPSec_MB_ver_0_52)) - message('IPSec_MB version >= 0.52 is required') + 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 - else - sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') endif endif +sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') allow_experimental_apis = true deps += ['bus_vdev'] -- 2.20.1