Merge pull request #385

zeek · Jan 30, 2024 · 75e94df · 75e94df
2 parents 69ccbf3 + ccdc315
commit 75e94df
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,14 @@
+2.8.0-dev.24 | 2024-01-30 17:28:02 +0100
+
+  * Fix build with Python >= 3.12 (Dominik Charousset, Corelight)
+
+    The distutils package has been removed in Python 3.12. Hence, we need a
+    different approach for finding the site-packages directory.
+
+    Since the FindPython module already sets appropriate variables for this
+    purpose (https://cmake.org/cmake/help/latest/module/FindPython.html), we
+    simply switch to using `Python_SITEARCH`.
+
 2.8.0-dev.22 | 2024-01-08 09:24:07 -0700
 
   * Bump CAF to fix runtime error on Windows (Dominik Charousset, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.0-dev.22
+2.8.0-dev.24
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -74,11 +74,7 @@ if ( NOT PY_MOD_INSTALL_DIR )
   elseif (BROKER_PYTHON_HOME)
     file(TO_CMAKE_PATH "${BROKER_PYTHON_HOME}/lib/python" PY_MOD_INSTALL_DIR)
   else ()
-    execute_process(COMMAND ${Python_EXECUTABLE} -c
-      "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
-      OUTPUT_VARIABLE python_site_packages
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    file(TO_CMAKE_PATH ${python_site_packages} PY_MOD_INSTALL_DIR)
+    set(PY_MOD_INSTALL_DIR "${Python_SITEARCH}")
   endif ()
 endif ()
 message(STATUS "Python bindings will be built and installed to:")