]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-90005-ffi: Fix building _ctypes without pkg-config (GH-94451)
authorChristian Heimes <christian@python.org>
Fri, 1 Jul 2022 07:23:41 +0000 (09:23 +0200)
committerGitHub <noreply@github.com>
Fri, 1 Jul 2022 07:23:41 +0000 (09:23 +0200)
The fallback path did not set LIBFFI_LIBS variable to link with ``-lffi``.

Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst [new file with mode: 0644]
configure
configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst b/Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst
new file mode 100644 (file)
index 0000000..62f40b8
--- /dev/null
@@ -0,0 +1 @@
+Fix building ``_ctypes`` extension without ``pkg-config``.
index 014d2cefb47f9a91a85e39a1f7a878d3838cdd09..9144ee190361787a0f8799ff41708179ddf2e688 100755 (executable)
--- a/configure
+++ b/configure
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_call" >&5
 $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
 if test "x$ac_cv_lib_ffi_ffi_call" = xyes; then :
-  have_libffi=yes
+
+          have_libffi=yes
+          LIBFFI_LIBS="-lffi"
+
 else
   have_libffi=no
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_call" >&5
 $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
 if test "x$ac_cv_lib_ffi_ffi_call" = xyes; then :
-  have_libffi=yes
+
+          have_libffi=yes
+          LIBFFI_LIBS="-lffi"
+
 else
   have_libffi=no
 fi
index ab1c6873f731de59abf0406f274d9821f9ef9ed9..12ae2ae8d87eb3c0103b6a7cffecfa9915331bda 100644 (file)
@@ -3605,7 +3605,10 @@ AS_VAR_IF([with_system_ffi], [yes], [
   PKG_CHECK_MODULES([LIBFFI], [libffi], [have_libffi=yes], [
     AC_CHECK_HEADER([ffi.h], [
       WITH_SAVE_ENV([
-        AC_CHECK_LIB([ffi], [ffi_call], [have_libffi=yes], [have_libffi=no])
+        AC_CHECK_LIB([ffi], [ffi_call], [
+          have_libffi=yes
+          LIBFFI_LIBS="-lffi"
+        ], [have_libffi=no])
       ])
     ])
   ])