From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 24 Nov 2023 19:10:55 +0000 (-0500)
Subject: cmake: build from qatlib submodule
X-Git-Tag: v19.3.0~58^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74c437a0c8d650f4a3351fd9960e4bd695d64cf7;p=ceph.git

cmake: build from qatlib submodule

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/.gitmodules b/.gitmodules
index 088ae3b577ce..fbe2690c9ee5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -75,3 +75,6 @@
 [submodule "src/jaegertracing/opentelemetry-cpp"]
 	path = src/jaegertracing/opentelemetry-cpp
 	url = https://github.com/open-telemetry/opentelemetry-cpp.git
+[submodule "src/qatlib"]
+	path = src/qatlib
+	url = https://github.com/intel/qatlib.git
diff --git a/cmake/modules/BuildQAT.cmake b/cmake/modules/BuildQAT.cmake
index 9296a0584a2a..737c63c3ea8c 100644
--- a/cmake/modules/BuildQAT.cmake
+++ b/cmake/modules/BuildQAT.cmake
@@ -1,9 +1,6 @@
 function(build_qat)
-  set(QAT_REPO https://github.com/intel/qatlib.git)
-  set(QAT_TAG "23.11.0")
-
-  set(QAT_SOURCE_DIR ${CMAKE_BINARY_DIR}/src/qatlib)
-  set(QAT_INSTALL_DIR ${QAT_SOURCE_DIR}/install)
+  set(QAT_BINARY_DIR ${CMAKE_BINARY_DIR}/src/qatlib)
+  set(QAT_INSTALL_DIR ${QAT_BINARY_DIR}/install)
   set(QAT_INCLUDE_DIR ${QAT_INSTALL_DIR}/include)
   set(QAT_LIBRARY_DIR ${QAT_INSTALL_DIR}/lib)
   set(QAT_LIBRARY ${QAT_LIBRARY_DIR}/libqat.a)
@@ -21,20 +18,13 @@ function(build_qat)
   # build a static library with -fPIC that we can link into crypto/compressor plugins
   list(APPEND configure_cmd --with-pic --enable-static --disable-shared)
 
-  set(source_dir_args
-    SOURCE_DIR ${QAT_SOURCE_DIR}
-    GIT_REPOSITORY ${QAT_REPO}
-    GIT_TAG ${QAT_TAG}
-    GIT_SHALLOW TRUE
-    GIT_CONFIG advice.detachedHead=false)
-
   # clear the DESTDIR environment variable from debian/rules,
   # because it messes with the internal install paths of arrow's bundled deps
   set(NO_DESTDIR_COMMAND ${CMAKE_COMMAND} -E env --unset=DESTDIR)
 
   include(ExternalProject)
   ExternalProject_Add(qatlib_ext
-    ${source_dir_args}
+    SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/qatlib"
     CONFIGURE_COMMAND ./autogen.sh COMMAND ${configure_cmd}
     BUILD_COMMAND ${NO_DESTDIR_COMMAND} make -j3
     BUILD_IN_SOURCE 1
diff --git a/src/qatlib b/src/qatlib
new file mode 160000
index 000000000000..142e305970ec
--- /dev/null
+++ b/src/qatlib
@@ -0,0 +1 @@
+Subproject commit 142e305970ec66a860945d20bb7c330f99ed900b