diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch b/meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch new file mode 100644 index 0000000000..8de5694cb4 --- /dev/null +++ b/meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | This fixes configure issues with recent autoconf, e.g: | ||
2 | autoreconf: Entering directory `Modules/_ctypes/libffi' | ||
3 | autoreconf: configure.ac: not using Gettext | ||
4 | autoreconf: running: aclocal --force | ||
5 | configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS | ||
6 | configure.ac:26: the top level | ||
7 | |||
8 | The problem is still present in python-2.6.5 but fixed in python-svn. | ||
9 | |||
10 | Upstream-Status: Accepted [python-svn] | ||
11 | |||
12 | Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> | ||
13 | Acked-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
16 | |||
17 | diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac Python-2.6.4/Modules/_ctypes/libffi/configure.ac | ||
18 | --- Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac 2009-04-28 22:01:18.000000000 +0200 | ||
19 | +++ Python-2.6.4/Modules/_ctypes/libffi/configure.ac 2010-04-20 22:46:02.000000000 +0200 | ||
20 | @@ -23,6 +23,7 @@ AM_INIT_AUTOMAKE | ||
21 | m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) | ||
22 | m4_define([_AC_ARG_VAR_PRECIOUS],[]) | ||
23 | AC_PROG_CC | ||
24 | +m4_undefine([_AC_ARG_VAR_PRECIOUS]) | ||
25 | m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) | ||
26 | |||
27 | AC_SUBST(CFLAGS) | ||
28 | @@ -366,7 +367,7 @@ test -d src/$TARGETDIR || mkdir src/$TAR | ||
29 | |||
30 | AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h) | ||
31 | |||
32 | -AC_CONFIG_FILES(include/ffi.h) | ||
33 | +AC_CONFIG_FILES(include/ffi.h include/Makefile Makefile) | ||
34 | |||
35 | AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h) | ||
36 | |||
37 | diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am Python-2.6.4/Modules/_ctypes/libffi/Makefile.am | ||
38 | --- Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am 2008-03-04 21:09:11.000000000 +0100 | ||
39 | +++ Python-2.6.4/Modules/_ctypes/libffi/Makefile.am 2010-04-20 22:54:03.000000000 +0200 | ||
40 | @@ -2,7 +2,7 @@ | ||
41 | |||
42 | AUTOMAKE_OPTIONS = foreign subdir-objects | ||
43 | |||
44 | -SUBDIRS = include testsuite man | ||
45 | +SUBDIRS = include | ||
46 | |||
47 | EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ | ||
48 | src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ | ||
49 | @@ -32,8 +32,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change | ||
50 | src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ | ||
51 | libtool-version ChangeLog.libffi | ||
52 | |||
53 | -info_TEXINFOS = doc/libffi.texi | ||
54 | - | ||
55 | ## ################################################################ | ||
56 | |||
57 | ## | ||
58 | |||