diff options
| author | Thomas Heller <theller@ctypes.org> | 2009-04-28 19:55:58 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2009-04-28 19:55:58 (GMT) |
| commit | c1edc2d632a8897509e5807b3a58c529c75d5c91 (patch) | |
| tree | cc603cbf775fbf4b33c235cd4a1eddea11b20020 /Modules | |
| parent | 8e8099c4915fc57990d026044f2168b1e6c6c326 (diff) | |
| download | cpython-c1edc2d632a8897509e5807b3a58c529c75d5c91.zip cpython-c1edc2d632a8897509e5807b3a58c529c75d5c91.tar.gz cpython-c1edc2d632a8897509e5807b3a58c529c75d5c91.tar.bz2 | |
Merged revisions 72081 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72081 | thomas.heller | 2009-04-28 21:23:41 +0200 (Di, 28 Apr 2009) | 3 lines
Issue #4305: ctypes fails to build on mipsel-linux-gnu (detects mips
instead of mipsel)
........
Diffstat (limited to 'Modules')
| -rwxr-xr-x | Modules/_ctypes/libffi/configure | 6 | ||||
| -rw-r--r-- | Modules/_ctypes/libffi/configure.ac | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure index de0b9ac..6984fc6 100755 --- a/Modules/_ctypes/libffi/configure +++ b/Modules/_ctypes/libffi/configure @@ -20426,10 +20426,10 @@ case "$host" in ;; mips-sgi-irix5.* | mips-sgi-irix6.*) - TARGET=MIPS; TARGETDIR=mips + TARGET=MIPS_IRIX; TARGETDIR=mips ;; mips*-*-linux*) - TARGET=MIPS; TARGETDIR=mips + TARGET=MIPS_LINUX; TARGETDIR=mips ;; powerpc*-*-linux* | powerpc-*-sysv*) @@ -20484,7 +20484,7 @@ echo "$as_me: error: \"libffi has not been ported to $host.\"" >&2;} { (exit 1); exit 1; }; } fi - if test x$TARGET = xMIPS; then + if expr x$TARGET : 'xMIPS' > /dev/null; then MIPS_TRUE= MIPS_FALSE='#' else diff --git a/Modules/_ctypes/libffi/configure.ac b/Modules/_ctypes/libffi/configure.ac index 57c161b..9470536 100644 --- a/Modules/_ctypes/libffi/configure.ac +++ b/Modules/_ctypes/libffi/configure.ac @@ -106,10 +106,10 @@ case "$host" in ;; mips-sgi-irix5.* | mips-sgi-irix6.*) - TARGET=MIPS; TARGETDIR=mips + TARGET=MIPS_IRIX; TARGETDIR=mips ;; mips*-*-linux*) - TARGET=MIPS; TARGETDIR=mips + TARGET=MIPS_LINUX; TARGETDIR=mips ;; powerpc*-*-linux* | powerpc-*-sysv*) @@ -162,7 +162,7 @@ if test $TARGETDIR = unknown; then AC_MSG_ERROR(["libffi has not been ported to $host."]) fi -AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS) +AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null]) AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) AM_CONDITIONAL(X86, test x$TARGET = xX86) AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD) |