Skip to content

Commit

Permalink
Python 3.12 deprecated python3-distutils
Browse files Browse the repository at this point in the history
As for python-3.12 the distutils package has been deprecated.
The latest ax_python_devel.m4 macro from the autoconf archive
has been updated accordingly so let's pull in the new version.

We can also drop the changes made to our customized version
to continue if the development version is not installed since
this functionality has been included upstream.

Reviewed-by: Rich Ercolani <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #16126
Closes #16129
  • Loading branch information
behlendorf authored and tonyhutter committed Apr 29, 2024
1 parent 2844898 commit 71216b9
Show file tree
Hide file tree
Showing 3 changed files with 235 additions and 117 deletions.
9 changes: 5 additions & 4 deletions config/always-pyzfs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [
[AC_MSG_ERROR("Python $PYTHON_VERSION unknown")]
)
AX_PYTHON_DEVEL([$PYTHON_REQUIRED_VERSION], [
AS_IF([test "x$enable_pyzfs" = xyes], [
AC_MSG_ERROR("Python $PYTHON_REQUIRED_VERSION development library is not installed")
], [test "x$enable_pyzfs" != xno], [
AS_IF([test "x$enable_pyzfs" = xyes], [
AX_PYTHON_DEVEL([$PYTHON_REQUIRED_VERSION])
], [
AX_PYTHON_DEVEL([$PYTHON_REQUIRED_VERSION], [true])
AS_IF([test "x$ax_python_devel_found" = xno], [
enable_pyzfs=no
])
])
Expand Down
Loading

0 comments on commit 71216b9

Please sign in to comment.