From 90344f9a29b833c7c0c698a3fbc7c8682d1e1f0c Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 4 Sep 2024 12:09:43 -0400 Subject: [PATCH] Fix build with Python 3.12, which deleted the long-deprecated 'distutils' module --- cmake/external/nanopb.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/external/nanopb.patch b/cmake/external/nanopb.patch index c3c3fe8e596..d4a51570440 100644 --- a/cmake/external/nanopb.patch +++ b/cmake/external/nanopb.patch @@ -1,7 +1,7 @@ diff -Naur nanopb/CMakeLists.txt nanopb-fix/CMakeLists.txt --- nanopb/CMakeLists.txt 2021-03-22 08:50:07.000000000 -0400 +++ nanopb-fix/CMakeLists.txt 2022-06-24 16:17:09.130783413 -0400 -@@ -41,7 +41,7 @@ +@@ -41,10 +41,10 @@ if(nanopb_BUILD_GENERATOR) set(generator_protos nanopb plugin) @@ -9,7 +9,11 @@ diff -Naur nanopb/CMakeLists.txt nanopb-fix/CMakeLists.txt + find_package(PythonInterp 3.7 REQUIRED) execute_process( COMMAND ${PYTHON_EXECUTABLE} -c - "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))" +- "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))" ++ "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" + OUTPUT_VARIABLE PYTHON_INSTDIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) diff -Naur nanopb/generator/nanopb_generator.py nanopb-fix/generator/nanopb_generator.py --- nanopb/generator/nanopb_generator.py 2021-03-22 08:50:07.000000000 -0400 +++ nanopb-fix/generator/nanopb_generator.py 2022-11-01 15:37:38.112297044 -0400