From 42448495973b06225253b52e0cbc3cfb9188f39b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 14:42:08 +0200 Subject: [PATCH] package/zfs: fix python3 support check Backport an upstream commit fixing the python3 support check "The 22.0 release of the python `packaging` package removed the `LegacyVersion` trait, causing ZFS to no longer compile. This commit replaces the sections of `ax_python_dev.m4` that rely on `LegacyVersion` with updated implementations from the upstream `autoconf-archive`." Add a comment above ZFS_AUTORECONF. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819411 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819410 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819409 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 2816038d8b468725f318d680a73044ef91925870) Signed-off-by: Peter Korsgaard --- ...LegacyVersion-broke-ax_python_dev.m4.patch | 134 ++++++++++++++++++ package/zfs/zfs.mk | 1 + 2 files changed, 135 insertions(+) create mode 100644 package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch diff --git a/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch new file mode 100644 index 0000000000..c7c4dc7d10 --- /dev/null +++ b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch @@ -0,0 +1,134 @@ +From ad2c8e13e42bc2f396cce117d17a227dadedd476 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 5 Jan 2023 11:04:24 -0800 +Subject: [PATCH] removal of LegacyVersion broke ax_python_dev.m4 + +The 22.0 release of the python `packaging` package removed the +`LegacyVersion` trait, causing ZFS to no longer compile. + +This commit replaces the sections of `ax_python_dev.m4` that rely on +`LegacyVersion` with updated implementations from the upstream +`autoconf-archive`. + +Reviewed-by: Brian Behlendorf +Signed-off-by: Matthew Ahrens +Closes #14297 +Upstream: https://github.com/openzfs/zfs/commit/b72efb751147ab57afd1588a15910f547cb22600 +[Romain: backport to 2.1.7] +Signed-off-by: Romain Naour +--- + config/ax_python_devel.m4 | 71 +++++++++++++++++++-------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) + +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index 7adcf01a0..9eef45065 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,23 +97,13 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`cat<= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_FAILURE([ ++ AC_MSG_FAILURE([ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +@@ -122,7 +112,6 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. + ]) +- ]) + else + AC_MSG_RESULT([skip at user request]) + fi +@@ -131,37 +120,47 @@ to something else than an empty string. + fi + + # +- # if the macro parameter ``version'' is set, honour it ++ # If the macro parameter ``version'' is set, honour it. ++ # A Python shim class, VPy, is used to implement correct version comparisons via ++ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for ++ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) +- # Why the strip ()? Because if we don't, version.parse +- # will, for example, report 3.10.0 >= '3.11.0' +- ac_supports_python_ver=`cat< ax_python_devel_vpy.py ++class VPy: ++ def vtup(self, s): ++ return tuple(map(int, s.strip().replace("rc", ".").split("."))) ++ def __init__(self): ++ import sys ++ self.vpy = tuple(sys.version_info) ++ def __eq__(self, s): ++ return self.vpy == self.vtup(s) ++ def __ne__(self, s): ++ return self.vpy != self.vtup(s) ++ def __lt__(self, s): ++ return self.vpy < self.vtup(s) ++ def __gt__(self, s): ++ return self.vpy > self.vtup(s) ++ def __le__(self, s): ++ return self.vpy <= self.vtup(s) ++ def __ge__(self, s): ++ return self.vpy >= self.vtup(s) ++EOF ++ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ ++ ver = ax_python_devel_vpy.VPy(); \ ++ print (ver $1)"` ++ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_ERROR([this package requires Python $1. ++ AC_MSG_ERROR([this package requires Python $1. + If you have it installed, but it isn't the default Python + interpreter in your system path, please pass the PYTHON_VERSION + variable to configure. See ``configure --help'' for reference. + ]) +- PYTHON_VERSION="" +- ]) ++ PYTHON_VERSION="" + fi + fi + +-- +2.34.3 + diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 84e9099ba9..97e9442cf8 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,6 +12,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs +# 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl