mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	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 <behlendorf1@llnl.gov> Signed-off-by: Matthew Ahrens <mahrens@delphix.com> Closes #14297
This commit is contained in:
		
							parent
							
								
									be697f4339
								
							
						
					
					
						commit
						37dbf91c8a
					
				| @ -97,22 +97,12 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ | |||||||
| 	# Check for a version of Python >= 2.1.0 | 	# Check for a version of Python >= 2.1.0 | ||||||
| 	# | 	# | ||||||
| 	AC_MSG_CHECKING([for a version of Python >= '2.1.0']) | 	AC_MSG_CHECKING([for a version of Python >= '2.1.0']) | ||||||
| 	ac_supports_python_ver=`cat<<EOD | $PYTHON - | 	ac_supports_python_ver=`$PYTHON -c "import sys; \ | ||||||
| from __future__ import print_function; | 		ver = sys.version.split ()[[0]]; \ | ||||||
| import sys; | 		print (ver >= '2.1.0')"` | ||||||
| try: |  | ||||||
| 	from packaging import version; |  | ||||||
| except ImportError: |  | ||||||
| 	from distlib import version; |  | ||||||
| ver = sys.version.split ()[[0]]; |  | ||||||
| (tst_cmp, tst_ver) = ">= '2.1.0'".split (); |  | ||||||
| tst_ver = tst_ver.strip ("'"); |  | ||||||
| eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))") |  | ||||||
| EOD` |  | ||||||
| 	if test "$ac_supports_python_ver" != "True"; then | 	if test "$ac_supports_python_ver" != "True"; then | ||||||
| 		if test -z "$PYTHON_NOVERSIONCHECK"; then | 		if test -z "$PYTHON_NOVERSIONCHECK"; then | ||||||
| 			AC_MSG_RESULT([no]) | 			AC_MSG_RESULT([no]) | ||||||
| 			m4_ifvaln([$2],[$2],[ |  | ||||||
| 			AC_MSG_FAILURE([ | 			AC_MSG_FAILURE([ | ||||||
| This version of the AC@&t@_PYTHON_DEVEL macro | This version of the AC@&t@_PYTHON_DEVEL macro | ||||||
| doesn't work properly with versions of Python before | doesn't work properly with versions of Python before | ||||||
| @ -121,7 +111,6 @@ variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, | |||||||
| PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. | PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. | ||||||
| Moreover, to disable this check, set PYTHON_NOVERSIONCHECK | Moreover, to disable this check, set PYTHON_NOVERSIONCHECK | ||||||
| to something else than an empty string. | to something else than an empty string. | ||||||
| ]) |  | ||||||
| ]) | ]) | ||||||
| 		else | 		else | ||||||
| 			AC_MSG_RESULT([skip at user request]) | 			AC_MSG_RESULT([skip at user request]) | ||||||
| @ -131,37 +120,47 @@ to something else than an empty string. | |||||||
| 	fi | 	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 | 	if test -n "$1"; then | ||||||
| 		AC_MSG_CHECKING([for a version of Python $1]) | 		AC_MSG_CHECKING([for a version of Python $1]) | ||||||
| 		# Why the strip ()?  Because if we don't, version.parse |                 cat << EOF > ax_python_devel_vpy.py | ||||||
| 		# will, for example, report 3.10.0 >= '3.11.0' | class VPy: | ||||||
| 		ac_supports_python_ver=`cat<<EOD | $PYTHON - |     def vtup(self, s): | ||||||
| 
 |         return tuple(map(int, s.strip().replace("rc", ".").split("."))) | ||||||
| from __future__ import print_function; |     def __init__(self): | ||||||
| import sys; |         import sys | ||||||
| try: |         self.vpy = tuple(sys.version_info) | ||||||
| 	from packaging import version; |     def __eq__(self, s): | ||||||
| except ImportError: |         return self.vpy == self.vtup(s) | ||||||
| 	from distlib import version; |     def __ne__(self, s): | ||||||
| ver = sys.version.split ()[[0]]; |         return self.vpy != self.vtup(s) | ||||||
| (tst_cmp, tst_ver) = "$1".split (); |     def __lt__(self, s): | ||||||
| tst_ver = tst_ver.strip ("'"); |         return self.vpy < self.vtup(s) | ||||||
| eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))") |     def __gt__(self, s): | ||||||
| EOD` |         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 | 		if test "$ac_supports_python_ver" = "True"; then | ||||||
| 			AC_MSG_RESULT([yes]) | 			AC_MSG_RESULT([yes]) | ||||||
| 		else | 		else | ||||||
| 			AC_MSG_RESULT([no]) | 			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 | If you have it installed, but it isn't the default Python | ||||||
| interpreter in your system path, please pass the PYTHON_VERSION | interpreter in your system path, please pass the PYTHON_VERSION | ||||||
| variable to configure. See ``configure --help'' for reference. | variable to configure. See ``configure --help'' for reference. | ||||||
| ]) | ]) | ||||||
| 			PYTHON_VERSION="" | 			PYTHON_VERSION="" | ||||||
| 			]) |  | ||||||
| 		fi | 		fi | ||||||
| 	fi | 	fi | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Matthew Ahrens
						Matthew Ahrens