0001-configure-ac-Add-support-for-Python-3-8.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From afae4fa61ffd8dee62667e60f931e371061c7d7d Mon Sep 17 00:00:00 2001
  2. From: Uwe Hermann <uwe@hermann-uwe.de>
  3. Date: Tue, 12 Nov 2019 21:58:23 +0100
  4. Subject: [PATCH] configure.ac: Add support for Python 3.8.
  5. This fixes bug #1438.
  6. [Retrieved from:
  7. https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=afae4fa61ffd8dee62667e60f931e371061c7d7d]
  8. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  9. ---
  10. configure.ac | 7 +++++--
  11. 1 file changed, 5 insertions(+), 2 deletions(-)
  12. diff --git a/configure.ac b/configure.ac
  13. index 772b984..d59e0be 100644
  14. --- a/configure.ac
  15. +++ b/configure.ac
  16. @@ -89,15 +89,18 @@ SRD_PKGLIBS_TESTS=
  17. SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
  18. # Python 3 is always needed.
  19. +# Starting with Python 3.8 we need to check for "python-3.8-embed"
  20. +# first, since usually only that variant will add "-lpython3.8".
  21. +# https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
  22. SR_PKG_CHECK([python3], [SRD_PKGLIBS],
  23. - [python3 >= 3.2], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
  24. + [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
  25. AS_IF([test "x$sr_have_python3" = xno],
  26. [AC_MSG_ERROR([Cannot find Python 3 development headers.])])
  27. # We also need to find the name of the python3 executable (for 'make install').
  28. # Some OSes call this python3, some call it python3.2, etc. etc.
  29. AC_ARG_VAR([PYTHON3], [Python 3 interpreter])
  30. -AC_CHECK_PROGS([PYTHON3], [python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3])
  31. +AC_CHECK_PROGS([PYTHON3], [python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3])
  32. AS_IF([test "x$PYTHON3" = x],
  33. [AC_MSG_ERROR([Cannot find Python 3 interpreter.])])
  34. --
  35. 2.24.0.rc2