Skip to content

Commit fb60f80

Browse files
doko42doko42
committed
Merged revisions 79098 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79098 | matthias.klose | 2010-03-19 18:46:33 +0100 (Fr, 19 Mär 2010) | 8 lines Generate libffi's Makefiles again to be able to run the libffi testsuite -- Diese und die folgenden Zeilen werden ignoriert -- M _ctypes/libffi/configure M _ctypes/libffi/configure.ac M _ctypes/libffi/aclocal.m4 M _ctypes/libffi.diff ........
1 parent 32ec9da commit fb60f80

File tree

4 files changed

+7728
-511
lines changed

4 files changed

+7728
-511
lines changed

‎Modules/_ctypes/libffi.diff‎

Lines changed: 64 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
1-
This file contains the diffs between the files in the libffi
2-
subdirectory and the 'official' source files from
3-
ftp://sourceware.org/pub/libffi/libffi-3.0.9.tar.gz
4-
5-
--- libffi/configure.ac.orig 2009-12-31 13:41:51.000000000 +0100
6-
+++ libffi/configure.ac 2010-02-24 00:39:10.341610848 +0100
7-
@@ -1,4 +1,7 @@
8-
dnl Process this with autoconf to create configure
9-
+#
10-
+# file from libffi - slightly patched for ctypes
11-
+#
12-
13-
AC_PREREQ(2.63)
14-
15-
@@ -91,6 +94,9 @@
16-
i?86-*-solaris2.1[[0-9]]*)
1+
diff -urN libffi.orig/configure libffi/configure
2+
--- libffi.orig/configure 2010-03-19 18:29:54.588499862 +0100
3+
+++ libffi/configure 2010-03-19 18:32:09.113499479 +0100
4+
@@ -11228,6 +11228,9 @@
5+
i?86-*-solaris2.1[0-9]*)
176
TARGET=X86_64; TARGETDIR=x86
187
;;
19-
+ i*86-*-nto-qnx*)
8+
+ i*86-*-nto-qnx*)
209
+ TARGET=X86; TARGETDIR=x86
2110
+ ;;
2211
i?86-*-*)
2312
TARGET=X86; TARGETDIR=x86
2413
;;
25-
@@ -108,12 +114,12 @@
14+
@@ -11245,12 +11248,12 @@
2615
;;
2716

2817
mips-sgi-irix5.* | mips-sgi-irix6.*)
@@ -37,40 +26,59 @@ ftp://sourceware.org/pub/libffi/libffi-3.0.9.tar.gz
3726
;;
3827

3928
powerpc*-*-linux* | powerpc-*-sysv*)
40-
@@ -170,7 +176,7 @@
41-
AC_MSG_ERROR(["libffi has not been ported to $host."])
29+
@@ -11307,7 +11310,7 @@
30+
as_fn_error "\"libffi has not been ported to $host.\"" "$LINENO" 5
4231
fi
4332

44-
-AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
45-
+AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
46-
AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
47-
AM_CONDITIONAL(X86, test x$TARGET = xX86)
48-
AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
49-
@@ -399,6 +405,10 @@
33+
- if test x$TARGET = xMIPS; then
34+
+ if expr x$TARGET : 'xMIPS' > /dev/null; then
35+
MIPS_TRUE=
36+
MIPS_FALSE='#'
37+
else
38+
@@ -12422,6 +12425,12 @@
39+
ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc"
5040

51-
AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
5241

53-
-AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
54-
+AC_CONFIG_FILES(include/ffi.h)
42+
+ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
5543
+
56-
+AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
5744
+
58-
+AC_CONFIG_FILES(fficonfig.py)
45+
+ac_config_files="$ac_config_files fficonfig.py"
46+
+
47+
+
48+
cat >confcache <<\_ACEOF
49+
# This file is a shell script that caches the results of configure
50+
# tests run on this system so they can be shared between configure
51+
@@ -13521,6 +13530,8 @@
52+
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
53+
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
54+
"libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;;
55+
+ "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
56+
+ "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
5957

60-
AC_OUTPUT
61-
--- libffi/configure.orig 2009-12-31 13:41:51.000000000 +0100
62-
+++ libffi/configure 2010-02-24 00:41:59.829608794 +0100
63-
@@ -12191,6 +12191,9 @@
64-
i?86-*-solaris2.1[0-9]*)
58+
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
59+
esac
60+
diff -urN libffi.orig/configure.ac libffi/configure.ac
61+
--- libffi.orig/configure.ac 2010-03-19 18:27:44.988498585 +0100
62+
+++ libffi/configure.ac 2010-03-19 18:31:29.252505178 +0100
63+
@@ -1,4 +1,7 @@
64+
dnl Process this with autoconf to create configure
65+
+#
66+
+# file from libffi - slightly patched for ctypes
67+
+#
68+
69+
AC_PREREQ(2.63)
70+
71+
@@ -91,6 +94,9 @@
72+
i?86-*-solaris2.1[[0-9]]*)
6573
TARGET=X86_64; TARGETDIR=x86
6674
;;
67-
+ i*86-*-nto-qnx*)
75+
+ i*86-*-nto-qnx*)
6876
+ TARGET=X86; TARGETDIR=x86
6977
+ ;;
7078
i?86-*-*)
7179
TARGET=X86; TARGETDIR=x86
7280
;;
73-
@@ -12208,12 +12211,12 @@
81+
@@ -108,12 +114,12 @@
7482
;;
7583

7684
mips-sgi-irix5.* | mips-sgi-irix6.*)
@@ -85,47 +93,27 @@ ftp://sourceware.org/pub/libffi/libffi-3.0.9.tar.gz
8593
;;
8694

8795
powerpc*-*-linux* | powerpc-*-sysv*)
88-
@@ -12272,7 +12275,7 @@
89-
{ (exit 1); exit 1; }; }
96+
@@ -170,7 +176,7 @@
97+
AC_MSG_ERROR(["libffi has not been ported to $host."])
9098
fi
9199

92-
- if test x$TARGET = xMIPS; then
93-
+ if expr x$TARGET : 'xMIPS' > /dev/null; then
94-
MIPS_TRUE=
95-
MIPS_FALSE='#'
96-
else
97-
@@ -14667,7 +14670,13 @@
98-
ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h"
100+
-AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
101+
+AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
102+
AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
103+
AM_CONDITIONAL(X86, test x$TARGET = xX86)
104+
AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
105+
@@ -401,4 +407,8 @@
99106

107+
AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
100108

101-
-ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc"
102-
+ac_config_files="$ac_config_files include/ffi.h"
103-
+
104-
+
105-
+ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
109+
+AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
106110
+
111+
+AC_CONFIG_FILES(fficonfig.py)
107112
+
108-
+ac_config_files="$ac_config_files fficonfig.py"
109-
110-
111-
cat >confcache <<\_ACEOF
112-
@@ -15767,12 +15776,9 @@
113-
"include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;;
114-
"src") CONFIG_COMMANDS="$CONFIG_COMMANDS src" ;;
115-
"include/ffitarget.h") CONFIG_LINKS="$CONFIG_LINKS include/ffitarget.h:src/$TARGETDIR/ffitarget.h" ;;
116-
- "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
117-
"include/ffi.h") CONFIG_FILES="$CONFIG_FILES include/ffi.h" ;;
118-
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
119-
- "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
120-
- "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
121-
- "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;;
122-
+ "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
123-
+ "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
124-
125-
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
126-
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
127-
--- libffi/src/x86/ffi64.c.orig 2009-12-29 16:22:26.000000000 +0100
128-
+++ libffi/src/x86/ffi64.c 2010-02-24 00:36:46.678610932 +0100
113+
AC_OUTPUT
114+
diff -urN libffi.orig/src/x86/ffi64.c libffi/src/x86/ffi64.c
115+
--- libffi.orig/src/x86/ffi64.c 2010-03-19 18:27:45.008523897 +0100
116+
+++ libffi/src/x86/ffi64.c 2010-03-19 18:24:36.437500070 +0100
129117
@@ -52,7 +52,7 @@
130118
/* Register class used for passing given 64bit part of the argument.
131119
These represent classes as documented by the PS ABI, with the exception
@@ -135,8 +123,9 @@ ftp://sourceware.org/pub/libffi/libffi-3.0.9.tar.gz
135123

136124
Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
137125
whenever possible (upper half does contain padding). */
138-
--- libffi/src/x86/ffi.c.orig 2009-12-29 16:22:26.000000000 +0100
139-
+++ libffi/src/x86/ffi.c 2010-02-24 00:36:46.678610932 +0100
126+
diff -urN libffi.orig/src/x86/ffi.c libffi/src/x86/ffi.c
127+
--- libffi.orig/src/x86/ffi.c 2010-03-19 18:27:45.008523897 +0100
128+
+++ libffi/src/x86/ffi.c 2010-03-19 18:24:36.441496039 +0100
140129
@@ -594,10 +594,10 @@
141130
return FFI_BAD_ABI;
142131
}

‎Modules/_ctypes/libffi/aclocal.m4‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,4 +1046,9 @@ AC_SUBST([am__tar])
10461046
AC_SUBST([am__untar])
10471047
]) # _AM_PROG_TAR
10481048

1049+
m4_include([m4/libtool.m4])
1050+
m4_include([m4/ltoptions.m4])
1051+
m4_include([m4/ltsugar.m4])
1052+
m4_include([m4/ltversion.m4])
1053+
m4_include([m4/lt~obsolete.m4])
10491054
m4_include([acinclude.m4])

0 commit comments

Comments
 (0)