zfs-sh.patch

   1 --- zfs-zfs-0.8.0-rc4/config/always-python.m4.orig      2019-04-16 22:24:49.000000000 +0200
   2 +++ zfs-zfs-0.8.0-rc4/config/always-python.m4   2019-05-08 18:38:16.579298208 +0200
   3 @@ -68,19 +68,19 @@
   4
   5         AM_PATH_PYTHON([2.6], [], [:])
   6         AM_CONDITIONAL([USING_PYTHON], [test "$PYTHON" != :])
   7 -       AM_CONDITIONAL([USING_PYTHON_2], [test "${PYTHON_VERSION:0:2}" = "2."])
   8 -       AM_CONDITIONAL([USING_PYTHON_3], [test "${PYTHON_VERSION:0:2}" = "3."])
   9 +       AM_CONDITIONAL([USING_PYTHON_2], [test "${PYTHON_VERSION%%.*}" = "2"])
  10 +       AM_CONDITIONAL([USING_PYTHON_3], [test "${PYTHON_VERSION%%.*}" = "3"])
  11
  12         dnl #
  13         dnl # Minimum supported Python versions for utilities:
  14         dnl # Python 2.6.x, or Python 3.4.x
  15         dnl #
  16 -       AS_IF([test "${PYTHON_VERSION:0:2}" = "2."], [
  17 +       AS_IF([test "${PYTHON_VERSION%%.*}" = "2"], [
  18                 ZFS_AC_PYTHON_VERSION([>= '2.6'], [ /bin/true ],
  19                         [AC_MSG_ERROR("Python >= 2.6.x is not available")])
  20         ])
  21
  22 -       AS_IF([test "${PYTHON_VERSION:0:2}" = "3."], [
  23 +       AS_IF([test "${PYTHON_VERSION%%.*}" = "3"], [
  24                 ZFS_AC_PYTHON_VERSION([>= '3.4'], [ /bin/true ],
  25                         [AC_MSG_ERROR("Python >= 3.4.x is not available")])
  26         ])
  27 --- zfs-zfs-0.8.0-rc4/config/always-pyzfs.m4.orig       2019-04-16 22:24:49.000000000 +0200
  28 +++ zfs-zfs-0.8.0-rc4/config/always-pyzfs.m4    2019-05-08 19:29:53.339188287 +0200
  29 @@ -26,10 +26,10 @@
  30         dnl # Require python-devel libraries
  31         dnl #
  32         AS_IF([test "x$enable_pyzfs" = xcheck  -o "x$enable_pyzfs" = xyes], [
  33 -               AS_IF([test "${PYTHON_VERSION:0:2}" = "2."], [
  34 +               AS_IF([test "${PYTHON_VERSION%%.*}" = "2"], [
  35                         PYTHON_REQUIRED_VERSION=">= '2.7.0'"
  36                 ], [
  37 -                       AS_IF([test "${PYTHON_VERSION:0:2}" = "3."], [
  38 +                       AS_IF([test "${PYTHON_VERSION%%.*}" = "3"], [
  39                                 PYTHON_REQUIRED_VERSION=">= '3.4.0'"
  40                         ], [
  41                                 AC_MSG_ERROR("Python $PYTHON_VERSION unknown")