0002-m4-nut_check_python.m4-allow-overriding-of-PYTHON-2-.patch 5.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106
  1. From 511ee899ee687216fa8fcf2231a60941b9e4cf81 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Fri, 3 Nov 2023 14:34:54 +0100
  4. Subject: [PATCH] m4/nut_check_python.m4: allow overriding of
  5. PYTHON{2,3}_SITE_PACKAGES
  6. Allow the end-user to override PYTHON{2,3}_SITE_PACKAGES as this can be
  7. useful when cross-compiling
  8. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  9. Upstream: https://github.com/networkupstools/nut/pull/2147
  10. ---
  11. m4/nut_check_python.m4 | 60 +++++++++++++++++++++---------------------
  12. 1 file changed, 30 insertions(+), 30 deletions(-)
  13. diff --git a/m4/nut_check_python.m4 b/m4/nut_check_python.m4
  14. index 995a3e7c..7f29558e 100644
  15. --- a/m4/nut_check_python.m4
  16. +++ b/m4/nut_check_python.m4
  17. @@ -116,17 +116,17 @@ AC_DEFUN([NUT_CHECK_PYTHON],
  18. AM_CONDITIONAL([HAVE_PYTHON], [test -n "${PYTHON}" && test "${PYTHON}" != "no"])
  19. AS_IF([test -n "${PYTHON}" && test "${PYTHON}" != "no"], [
  20. export PYTHON
  21. - AC_MSG_CHECKING([python site-packages location])
  22. - PYTHON_SITE_PACKAGES="`${PYTHON} -c 'import site; print(site.getsitepackages().pop(0))'`"
  23. - AS_CASE(["$PYTHON_SITE_PACKAGES"],
  24. - [*:*], [
  25. - dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584]
  26. - PYTHON_SITE_PACKAGES="`cd "$PYTHON_SITE_PACKAGES" && pwd`"
  27. - ]
  28. - )
  29. - AC_MSG_RESULT([${PYTHON_SITE_PACKAGES}])
  30. + AC_CACHE_CHECK([python site-packages location], [nut_cv_PYTHON_SITE_PACKAGES], [
  31. + nut_cv_PYTHON_SITE_PACKAGES="`${PYTHON} -c 'import site; print(site.getsitepackages().pop(0))'`"
  32. + AS_CASE(["$nut_cv_PYTHON_SITE_PACKAGES"],
  33. + [*:*], [
  34. + dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584]
  35. + nut_cv_PYTHON_SITE_PACKAGES="`cd "$nut_cv_PYTHON_SITE_PACKAGES" && pwd`"
  36. + ]
  37. + )
  38. + ])
  39. ])
  40. - AC_SUBST([PYTHON_SITE_PACKAGES], [${PYTHON_SITE_PACKAGES}])
  41. + AC_SUBST([PYTHON_SITE_PACKAGES], [${nut_cv_PYTHON_SITE_PACKAGES}])
  42. AM_CONDITIONAL([HAVE_PYTHON_SITE_PACKAGES], [test x"${PYTHON_SITE_PACKAGES}" != "x"])
  43. ])
  44. ])
  45. @@ -228,17 +228,17 @@ AC_DEFUN([NUT_CHECK_PYTHON2],
  46. AM_CONDITIONAL([HAVE_PYTHON2], [test -n "${PYTHON2}" && test "${PYTHON2}" != "no"])
  47. AS_IF([test -n "${PYTHON2}" && test "${PYTHON2}" != "no"], [
  48. export PYTHON2
  49. - AC_MSG_CHECKING([python2 site-packages location])
  50. - PYTHON2_SITE_PACKAGES="`${PYTHON2} -c 'import site; print(site.getsitepackages().pop(0))'`"
  51. - AS_CASE(["$PYTHON2_SITE_PACKAGES"],
  52. - [*:*], [
  53. - dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584]
  54. - PYTHON2_SITE_PACKAGES="`cd "$PYTHON2_SITE_PACKAGES" && pwd`"
  55. - ]
  56. - )
  57. - AC_MSG_RESULT([${PYTHON2_SITE_PACKAGES}])
  58. + AC_CACHE_CHECK([python2 site-packages location], [nut_cv_PYTHON2_SITE_PACKAGES], [
  59. + nut_cv_PYTHON2_SITE_PACKAGES="`${PYTHON2} -c 'import site; print(site.getsitepackages().pop(0))'`"
  60. + AS_CASE(["$nut_cv_PYTHON2_SITE_PACKAGES"],
  61. + [*:*], [
  62. + dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584]
  63. + nut_cv_PYTHON2_SITE_PACKAGES="`cd "$nut_cv_PYTHON2_SITE_PACKAGES" && pwd`"
  64. + ]
  65. + )
  66. + ])
  67. ])
  68. - AC_SUBST([PYTHON2_SITE_PACKAGES], [${PYTHON2_SITE_PACKAGES}])
  69. + AC_SUBST([PYTHON2_SITE_PACKAGES], [${nut_cv_PYTHON2_SITE_PACKAGES}])
  70. AM_CONDITIONAL([HAVE_PYTHON2_SITE_PACKAGES], [test x"${PYTHON2_SITE_PACKAGES}" != "x"])
  71. ])
  72. ])
  73. @@ -340,17 +340,17 @@ AC_DEFUN([NUT_CHECK_PYTHON3],
  74. AM_CONDITIONAL([HAVE_PYTHON3], [test -n "${PYTHON3}" && test "${PYTHON3}" != "no"])
  75. AS_IF([test -n "${PYTHON3}" && test "${PYTHON3}" != "no"], [
  76. export PYTHON3
  77. - AC_MSG_CHECKING([python3 site-packages location])
  78. - PYTHON3_SITE_PACKAGES="`${PYTHON3} -c 'import site; print(site.getsitepackages().pop(0))'`"
  79. - AS_CASE(["$PYTHON3_SITE_PACKAGES"],
  80. - [*:*], [
  81. - dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584]
  82. - PYTHON3_SITE_PACKAGES="`cd "$PYTHON3_SITE_PACKAGES" && pwd`"
  83. - ]
  84. - )
  85. - AC_MSG_RESULT([${PYTHON3_SITE_PACKAGES}])
  86. + AC_CACHE_CHECK([python3 site-packages location], [nut_cv_PYTHON3_SITE_PACKAGES], [
  87. + nut_cv_PYTHON3_SITE_PACKAGES="`${PYTHON3} -c 'import site; print(site.getsitepackages().pop(0))'`"
  88. + AS_CASE(["$nut_cv_PYTHON3_SITE_PACKAGES"],
  89. + [*:*], [
  90. + dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584]
  91. + nut_cv_PYTHON3_SITE_PACKAGES="`cd "$nut_cv_PYTHON3_SITE_PACKAGES" && pwd`"
  92. + ]
  93. + )
  94. + ])
  95. ])
  96. - AC_SUBST([PYTHON3_SITE_PACKAGES], [${PYTHON3_SITE_PACKAGES}])
  97. + AC_SUBST([PYTHON3_SITE_PACKAGES], [${nut_cv_PYTHON3_SITE_PACKAGES}])
  98. AM_CONDITIONAL([HAVE_PYTHON3_SITE_PACKAGES], [test x"${PYTHON3_SITE_PACKAGES}" != "x"])
  99. ])
  100. ])
  101. --
  102. 2.42.0