50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 4840b5e8293287af45f1e6062e5272a9b2ee0535 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Mon, 10 Jun 2019 09:34:59 +0100
|
|
Subject: [PATCH] python: Further fix for Python 3.8 embedding.
|
|
|
|
Further attempt to fix Python 3.8; see also
|
|
commit fb1a74b3d84571bc4c6bb57b26128c92b3368c52
|
|
and https://bugzilla.redhat.com/show_bug.cgi?id=1718294
|
|
---
|
|
configure.ac | 12 +++---------
|
|
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 3489ae1..24d986f 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -474,18 +474,12 @@ AS_IF([test "x$PYTHON" != "xno" && test "x$enable_python" != "xno"],[
|
|
])
|
|
|
|
dnl Check for Python CFLAGS, libraries.
|
|
- dnl For Python >= 3.8 we have to use python-embed.pc, see:
|
|
+ dnl For Python >= 3.8 we have to use python-<VERSION>-embed.pc, see:
|
|
dnl https://docs.python.org/3.8/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
|
|
dnl The python.pc is called python-<VERSION>.pc on Debian and
|
|
dnl later versions of Fedora, and python.pc on older versions
|
|
dnl of Fedora.
|
|
- PKG_CHECK_MODULES([PYTHON], [python-embed-"$PYTHON_VERSION"], [
|
|
- AC_SUBST([PYTHON_CFLAGS])
|
|
- AC_SUBST([PYTHON_LIBS])
|
|
- AC_SUBST([PYTHON_VERSION])
|
|
- AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
|
|
- ],[
|
|
- PKG_CHECK_MODULES([PYTHON], [python-embed], [
|
|
+ PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"-embed], [
|
|
AC_SUBST([PYTHON_CFLAGS])
|
|
AC_SUBST([PYTHON_LIBS])
|
|
AC_SUBST([PYTHON_VERSION])
|
|
@@ -505,7 +499,7 @@ AS_IF([test "x$PYTHON" != "xno" && test "x$enable_python" != "xno"],[
|
|
],[
|
|
AC_MSG_WARN([python $PYTHON_VERSION not found])
|
|
enable_python=no
|
|
- ])])])])
|
|
+ ])])])
|
|
|
|
dnl Check for various functions needed by the bindings.
|
|
old_LIBS="$LIBS"
|
|
--
|
|
2.22.0
|
|
|