build: finalize numactl dependency removal

Following 8ab0267, which dropped the build dependency on numactl, this commit removes all remaining references from the build system. This includes cleaning up template files (.pc.in and .cmake.in) that still contained unnecessary numactl references. Changes: - Remove Findnumactl.cmake since it's no longer needed at configuration time - Remove numactl::numactl library linking as we no longer need its headers or libraries - Remove unused Seastar_NUMA CMake option - Remove numactl from SeastarDependencies.cmake This completes the work started in 8ab0267 and ensures Seastar applications no longer pull in numactl's cflags or libraries during the build process. Signed-off-by: Kefu Chai <[email protected]>
scylladb · Feb 18, 2025 · f62d1c7 · f62d1c7
1 parent d01796d
commit f62d1c7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 70 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -282,10 +282,6 @@ option (Seastar_INSTALL
   "Install targets."
   ${Seastar_MASTER_PROJECT})
 
-option (Seastar_NUMA
-  "Enable NUMA support."
-  ON)
-
 option (Seastar_TESTING
   "Enable testing targets."
   ${Seastar_MASTER_PROJECT})
@@ -1046,13 +1042,6 @@ if (Seastar_LD_FLAGS)
     PRIVATE ${Seastar_LD_FLAGS})
 endif ()
 
-if (Seastar_NUMA)
-  list (APPEND Seastar_PRIVATE_COMPILE_DEFINITIONS SEASTAR_HAVE_NUMA)
-
-  target_link_libraries (seastar
-    PRIVATE numactl::numactl)
-endif ()
-
 if (SystemTap-SDT_FOUND)
   list (APPEND Seastar_PRIVATE_COMPILE_DEFINITIONS SEASTAR_HAVE_SYSTEMTAP_SDT)
 
@@ -1407,7 +1396,6 @@ if (Seastar_INSTALL)
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findhwloc.cmake
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findlksctp-tools.cmake
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findlz4.cmake
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findnumactl.cmake
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findragel.cmake
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findrt.cmake
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Finducontext.cmake

diff --git a/cmake/Findnumactl.cmake b/cmake/Findnumactl.cmake
diff --git a/cmake/SeastarConfig.cmake.in b/cmake/SeastarConfig.cmake.in
@@ -59,7 +59,6 @@ include (SeastarDependencies)
 set (Seastar_DPDK @Seastar_DPDK@)
 set (Seastar_IO_URING @Seastar_IO_URING@)
 set (Seastar_HWLOC @Seastar_HWLOC@)
-set (Seastar_NUMA @Seastar_NUMA@)
 seastar_find_dependencies ()
 
 if (NOT TARGET Seastar::seastar)

diff --git a/cmake/SeastarDependencies.cmake b/cmake/SeastarDependencies.cmake
@@ -91,7 +91,6 @@ macro (seastar_find_dependencies)
     SystemTap-SDT
     hwloc
     lksctp-tools # No version information published.
-    numactl # No version information published.
     rt
     ucontext
     yaml-cpp)
@@ -128,8 +127,6 @@ macro (seastar_find_dependencies)
     OPTION ${Seastar_HWLOC})
   seastar_set_dep_args (lksctp-tools REQUIRED)
   seastar_set_dep_args (rt REQUIRED)
-  seastar_set_dep_args (numactl
-    OPTION ${Seastar_NUMA})
   seastar_set_dep_args (ucontext REQUIRED)
   seastar_set_dep_args (yaml-cpp REQUIRED
     VERSION 0.5.1)

diff --git a/pkgconfig/seastar.pc.in b/pkgconfig/seastar.pc.in
@@ -28,8 +28,6 @@ lksctp_tools_cflags=-I$<JOIN:@lksctp-tools_INCLUDE_DIRS@, -I>
 lksctp_tools_libs=$<JOIN:@lksctp-tools_LIBRARIES@, >
 liburing_cflags=$<$<BOOL:@Seastar_IO_URING@>:-I$<JOIN:$<TARGET_PROPERTY:URING::uring,INTERFACE_INCLUDE_DIRECTORIES>, -I>>
 liburing_libs=$<$<BOOL:@Seastar_IO_URING@>:$<JOIN:@URING_LIBRARIES@, >>
-numactl_cflags=-I$<JOIN:@numactl_INCLUDE_DIRS@, -I>
-numactl_libs=$<JOIN:@numactl_LIBRARIES@, >
 dpdk_libs=$<JOIN:@dpdk_LIBRARIES@, >
 # Us.
 seastar_cflags=${seastar_include_flags} $<JOIN:$<TARGET_PROPERTY:seastar,INTERFACE_COMPILE_OPTIONS>, > -D$<JOIN:$<TARGET_PROPERTY:seastar,INTERFACE_COMPILE_DEFINITIONS>, -D>
@@ -38,6 +36,6 @@ seastar_libs=${libdir}/$<TARGET_FILE_NAME:seastar> @Seastar_SPLIT_DWARF_FLAG@ $<
 Requires: liblz4 >= 1.7.3
 Requires.private: gnutls >= 3.2.26, protobuf >= 2.5.0, hwloc >= 1.11.2, $<$<BOOL:@Seastar_IO_URING@>:liburing $<ANGLE-R>= 2.0, >yaml-cpp >= 0.5.1
 Conflicts:
-Cflags: @Seastar_CXX_COMPILE_OPTION@ ${boost_cflags} ${c_ares_cflags} ${fmt_cflags} ${liburing_cflags} ${lksctp_tools_cflags} ${numactl_cflags} ${seastar_cflags}
+Cflags: @Seastar_CXX_COMPILE_OPTION@ ${boost_cflags} ${c_ares_cflags} ${fmt_cflags} ${liburing_cflags} ${lksctp_tools_cflags} ${seastar_cflags}
 Libs: ${seastar_libs} ${boost_program_options_libs} ${boost_thread_libs} ${c_ares_libs} ${fmt_libs}
-Libs.private: ${dl_libs} ${rt_libs} ${boost_thread_libs} ${lksctp_tools_libs} ${liburing_libs} ${numactl_libs} ${stdatomic_libs} ${dpdk_libs}
+Libs.private: ${dl_libs} ${rt_libs} ${boost_thread_libs} ${lksctp_tools_libs} ${liburing_libs} ${stdatomic_libs} ${dpdk_libs}