Add meson build files.
Signed-off-by: Tomasz Jozwiak <tomaszx.jozw...@intel.com>
Signed-off-by: Fiona Trahe <fiona.tr...@intel.com>
---
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 6ec0bd3..e23f727 100644
--- a/drivers/common/qat/Makefile
+++ b/drivers/common/qat/Makefile
@@ -57,7 +57,7 @@ LDLIBS += -lrte_pci -lrte_bus_pci
SYMLINK-y-include +=
# versioning export map
-EXPORT_MAP := ../../crypto/qat/rte_pmd_qat_version.map
+EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map
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
--
2.7.4
