1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
http://bugs.python.org/issue6943
http://hg.python.org/cpython/rev/f02881332342
http://hg.python.org/cpython/rev/6d9be1a97c17
--- configure.in
+++ configure.in
@@ -2046,11 +2046,20 @@
],
[AC_MSG_RESULT(no)])
+AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+
# Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi)
AC_ARG_WITH(system_ffi,
AC_HELP_STRING(--with-system-ffi, build _ctypes module using an installed ffi library))
+if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then
+ LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
+else
+ LIBFFI_INCLUDEDIR=""
+fi
+AC_SUBST(LIBFFI_INCLUDEDIR)
+
AC_MSG_RESULT($with_system_ffi)
# Determine if signalmodule should be used.
--- Makefile.pre.in
+++ Makefile.pre.in
@@ -202,6 +202,8 @@
GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
+LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
+
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
--- setup.py
+++ setup.py
@@ -1929,7 +1929,9 @@
# in /usr/include/ffi
inc_dirs.append('/usr/include/ffi')
- ffi_inc = find_file('ffi.h', [], inc_dirs)
+ ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
+ if not ffi_inc:
+ ffi_inc = find_file('ffi.h', [], inc_dirs)
if ffi_inc is not None:
ffi_h = ffi_inc[0] + '/ffi.h'
fp = open(ffi_h)
|
GitWeb
