From 489562aca728a70ec74e9860ae94627cdb2eb163 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 26 Oct 2023 11:26:50 +0200 Subject: [PATCH] package/libftdi1: add patch to move from distutils to sysconfig In preperation of python 3.12.0, distutils has been removed completely. Take an upstream commit that switches to sysconfig instead of distutils to find the python module path. Signed-off-by: Adam Duskett [Arnout: - apply to libftdi1, not libftdi; - use the actual upstream commit instead of something homegrown; - use a URL to the upstream commit instead of just the hash. ] Signed-off-by: Arnout Vandecappelle --- ...004-move-from-distutils-to-sysconfig.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/libftdi1/0004-move-from-distutils-to-sysconfig.patch diff --git a/package/libftdi1/0004-move-from-distutils-to-sysconfig.patch b/package/libftdi1/0004-move-from-distutils-to-sysconfig.patch new file mode 100644 index 0000000000..7b38993ada --- /dev/null +++ b/package/libftdi1/0004-move-from-distutils-to-sysconfig.patch @@ -0,0 +1,33 @@ +From abd19b721f7e9b4d514ed319ece173ebc7b1ea72 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 19 Dec 2022 17:40:43 +0100 +Subject: [PATCH] python: move from distutils to sysconfig + +The distutils module was deprecated in Python 3.10, and will be removed +in 3.12 [1], thus switch to the sysconfig module instead. + +[1] https://peps.python.org/pep-0632/ + +Upstream: http://developer.intra2net.com/git/?p=libftdi;a=commit;h=abd19b721f7e9b4d514ed319ece173ebc7b1ea72 +Signed-off-by: Adam Duskett +Signed-off-by: Arnout Vandecappelle +--- + python/CMakeLists.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 5e406ff..9358419 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -42,7 +42,7 @@ endif () + + set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES NO_SONAME ON ) + +-execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print( sysconfig.get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )" ++execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print( sysconfig.get_path( 'platlib', vars={'platbase': '${CMAKE_INSTALL_PREFIX}'} ) )" + OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE ) + +-- +1.7.1 +