Mercurial > cpython-lru_cache-weakref

annotate Modules/_ctypes/libffi.diff @ 80661:94de77bd0b4b 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.
author Andrew Svetlov <andrew.svetlov@gmail.com>
date Thu, 29 Nov 2012 19:51:28 +0200
parents 2512c2ad5de7
children b10ec5083a53 25421e1c48bb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
1 diff -urN libffi.orig/configure libffi/configure
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
2 --- libffi.orig/configure 2010-03-19 18:29:54.588499862 +0100
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
3 +++ libffi/configure 2010-03-19 18:32:09.113499479 +0100
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
4 @@ -11228,6 +11228,9 @@
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
5 i?86-*-solaris2.1[0-9]*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
6 TARGET=X86_64; TARGETDIR=x86
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
7 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
8 + i*86-*-nto-qnx*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
9 + TARGET=X86; TARGETDIR=x86
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
10 + ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
11 i?86-*-*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
12 TARGET=X86; TARGETDIR=x86
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
13 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
14 @@ -11245,12 +11248,12 @@
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
15 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
16
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
17 mips-sgi-irix5.* | mips-sgi-irix6.*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
18 - TARGET=MIPS; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
19 + TARGET=MIPS_IRIX; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
20 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
21 mips*-*-linux*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
22 # Support 128-bit long double for NewABI.
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
23 HAVE_LONG_DOUBLE='defined(__mips64)'
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
24 - TARGET=MIPS; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
25 + TARGET=MIPS_IRIX; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
26 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
27
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
28 powerpc*-*-linux* | powerpc-*-sysv*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
29 @@ -11307,7 +11310,7 @@
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
30 as_fn_error "\"libffi has not been ported to $host.\"" "$LINENO" 5
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
31 fi
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
32
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
33 - if test x$TARGET = xMIPS; then
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
34 + if expr x$TARGET : 'xMIPS' > /dev/null; then
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
35 MIPS_TRUE=
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
36 MIPS_FALSE='#'
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
37 else
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
38 @@ -12422,6 +12425,12 @@
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
39 ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc"
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
40
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
41
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
42 +ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
43 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
44 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
45 +ac_config_files="$ac_config_files fficonfig.py"
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
46 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
47 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
48 cat >confcache <<\_ACEOF
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
49 # This file is a shell script that caches the results of configure
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
50 # tests run on this system so they can be shared between configure
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
51 @@ -13521,6 +13530,8 @@
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
52 "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
53 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
54 "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
55 + "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
56 + "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
57
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
58 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
59 esac
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
60 diff -urN libffi.orig/configure.ac libffi/configure.ac
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
61 --- libffi.orig/configure.ac 2010-03-19 18:27:44.988498585 +0100
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
62 +++ libffi/configure.ac 2010-03-19 18:31:29.252505178 +0100
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
63 @@ -1,4 +1,7 @@
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
64 dnl Process this with autoconf to create configure
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
65 +#
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
66 +# file from libffi - slightly patched for ctypes
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
67 +#
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
68
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
69 AC_PREREQ(2.63)
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
70
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
71 @@ -91,6 +94,9 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
72 i?86-*-solaris2.1[[0-9]]*)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
73 TARGET=X86_64; TARGETDIR=x86
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
74 ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
75 + i*86-*-nto-qnx*)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
76 + TARGET=X86; TARGETDIR=x86
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
77 + ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
78 i?86-*-*)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
79 TARGET=X86; TARGETDIR=x86
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
80 ;;
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
81 @@ -108,12 +114,12 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
82 ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
83
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
84 mips-sgi-irix5.* | mips-sgi-irix6.*)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
85 - TARGET=MIPS; TARGETDIR=mips
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
86 + TARGET=MIPS_IRIX; TARGETDIR=mips
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
87 ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
88 mips*-*-linux*)
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
89 # Support 128-bit long double for NewABI.
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
90 HAVE_LONG_DOUBLE='defined(__mips64)'
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
91 - TARGET=MIPS; TARGETDIR=mips
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
92 + TARGET=MIPS_IRIX; TARGETDIR=mips
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
93 ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
94
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
95 powerpc*-*-linux* | powerpc-*-sysv*)
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
96 @@ -170,7 +176,7 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
97 AC_MSG_ERROR(["libffi has not been ported to $host."])
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
98 fi
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
99
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
100 -AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
101 +AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
102 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
103 AM_CONDITIONAL(X86, test x$TARGET = xX86)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
104 AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
105 @@ -401,4 +407,8 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
106
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
107 AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
108
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
109 +AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
110 +
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
111 +AC_CONFIG_FILES(fficonfig.py)
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
112 +
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
113 AC_OUTPUT