From patchwork Wed Jul 11 11:56:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fiona Trahe X-Patchwork-Id: 42837 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 54DFE1B575; Wed, 11 Jul 2018 13:57:40 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 94FC91B519 for ; Wed, 11 Jul 2018 13:57:35 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jul 2018 04:57:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,338,1526367600"; d="scan'208";a="54214079" Received: from sivswdev01.ir.intel.com (HELO localhost.localdomain) ([10.237.217.45]) by fmsmga008.fm.intel.com with ESMTP; 11 Jul 2018 04:57:33 -0700 From: Fiona Trahe To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com, fiona.trahe@intel.com, tomaszx.jozwiak@intel.com Date: Wed, 11 Jul 2018 12:56:56 +0100 Message-Id: <1531310229-17448-4-git-send-email-fiona.trahe@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1531183311-32619-1-git-send-email-fiona.trahe@intel.com> References: <1531183311-32619-1-git-send-email-fiona.trahe@intel.com> Subject: [dpdk-dev] [PATCH v5 03/16] compress/qat: add meson build 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" Add meson build files. Signed-off-by: Tomasz Jozwiak Signed-off-by: Fiona Trahe --- drivers/common/qat/Makefile | 2 +- drivers/compress/meson.build | 2 +- drivers/compress/qat/meson.build | 18 ++++++++++++++++++ drivers/compress/qat/rte_pmd_qat_version.map | 3 +++ drivers/crypto/qat/meson.build | 10 ++-------- drivers/crypto/qat/rte_pmd_qat_version.map | 3 --- 6 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 drivers/compress/qat/meson.build create mode 100644 drivers/compress/qat/rte_pmd_qat_version.map delete mode 100644 drivers/crypto/qat/rte_pmd_qat_version.map diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile index 2a4c99b..c68a032 100644 --- a/drivers/common/qat/Makefile +++ b/drivers/common/qat/Makefile @@ -60,7 +60,7 @@ ifdef build_qat SYMLINK-y-include += # versioning export map - EXPORT_MAP := ../../crypto/qat/rte_pmd_qat_version.map + EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map endif include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build index fb136e1..2352ad5 100644 --- a/drivers/compress/meson.build +++ b/drivers/compress/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -drivers = ['isal'] +drivers = ['isal', 'qat'] std_deps = ['compressdev'] # compressdev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' diff --git a/drivers/compress/qat/meson.build b/drivers/compress/qat/meson.build new file mode 100644 index 0000000..9d15076 --- /dev/null +++ b/drivers/compress/qat/meson.build @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017-2018 Intel Corporation + + +# Add our sources files to the list +allow_experimental_apis = true +qat_sources += files('qat_comp_pmd.c', + 'qat_comp.c') +qat_includes += include_directories('.') +qat_deps += 'compressdev' +qat_ext_deps += dep + +# build the whole driver +sources += qat_sources +cflags += qat_cflags +deps += qat_deps +ext_deps += qat_ext_deps +includes += qat_includes diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map new file mode 100644 index 0000000..ad6e191 --- /dev/null +++ b/drivers/compress/qat/rte_pmd_qat_version.map @@ -0,0 +1,3 @@ +DPDK_18.08 { + local: *; +}; diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build index 2873637..d7cff68 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -1,6 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation +# this does not build the QAT driver, instead that is done in the compression +# driver which comes later. Here we just add our sources files to the list build = false dep = dependency('libcrypto', required: false) if dep.found() @@ -13,12 +15,4 @@ if dep.found() qat_ext_deps += dep pkgconfig_extra_libs += '-lcrypto' qat_cflags += '-DBUILD_QAT_SYM' - - # build the whole driver - sources += qat_sources - cflags += qat_cflags - deps += qat_deps - ext_deps += qat_ext_deps - includes += qat_includes - build = true endif diff --git a/drivers/crypto/qat/rte_pmd_qat_version.map b/drivers/crypto/qat/rte_pmd_qat_version.map deleted file mode 100644 index bbaf1c8..0000000 --- a/drivers/crypto/qat/rte_pmd_qat_version.map +++ /dev/null @@ -1,3 +0,0 @@ -DPDK_2.2 { - local: *; -}; \ No newline at end of file