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)
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 2d95ef84fa1779d2cb5a99e8f969b8eda842268f..0d533cf15d9ace9d9994d6b73277da98ab3e19d8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,8 @@ Installation
 Library
 -------
 
+- Issue #4305: ctypes should now build again on mipsel-linux-gnu
+
 - Issue #1734234: Massively speedup ``unicodedata.normalize()`` when the
   string is already in normalized form, by performing a quick check beforehand.
   Original patch by Rauli Ruohonen.

diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
index de0b9aca13236b8b9a2f4ee383e6248fa3965565..6984fc67fbc462ba7f77f773403922ff0f14e686 100755 (executable)
--- 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 57c161befe16b6ae065ebc4e2693f7f6f8400b4c..947053690e54dc13c968bcd751953dfd61578f2e 100644 (file)
--- 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)