Temporarily remove folly dep

CCI-MOC · Jun 4, 2024 · fb43400 · fb43400
1 parent 124cd5f
commit fb43400
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -1,10 +1,10 @@
 cxx = meson.get_compiler('cpp')
 
-cmake = import('cmake')
+# cmake = import('cmake')
 # cmvars = cmake.subproject_options()
 # cmvars.add_cmake_defines({'POSITION_INDEPENDENT_CODE': true})
-folly_cm = cmake.subproject('folly')
-libfolly = folly_cm.dependency('folly')
+# folly_cm = cmake.subproject('folly')
+# libfolly = folly_cm.dependency('folly')
 
 lsvd_src = files(
 	'config.cc',
@@ -22,11 +22,11 @@ lsvd_src = files(
 
 lsvd_inc = include_directories('.')
 lsvd_deps = [
-	libfolly,
+	# libfolly,
 	dependency('threads'),
 	dependency('zlib'),
 	dependency('fmt'),
-	dependency('boost'),
+	dependency('boost', modules: ['system', 'filesystem', 'program_options', 'thread', 'regex']),
 	dependency('liburing', static: true),
 	dependency('uuid'),
 	cxx.find_library('rados', required: true),

diff --git a/src/utils.h b/src/utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "folly/FBVector.h"
+// #include "folly/FBVector.h"
 #include <boost/stacktrace.hpp>
 #include <cerrno>
 #include <condition_variable>
@@ -32,7 +32,7 @@ template <typename T> using sptr = std::shared_ptr<T>;
 template <typename T> using uptr = std::unique_ptr<T>;
 template <typename T> using opt = std::optional<T>;
 template <typename T> using vec = std::vector<T>;
-template <typename T> using fvec = folly::fbvector<T>;
+// template <typename T> using fvec = folly::fbvector<T>;
 
 #define CEXTERN extern "C"