[Python-checkins] r72083 - in python/branches/release26-maint: Misc/NEWS Modules/_ctypes/libffi/configure Modules/_ctypes/libffi/configure.ac

[thomas.heller]

Author: thomas.heller
Date: Tue Apr 28 22:01:18 2009
New Revision: 72083

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_ctypes/libffi/configure
   python/branches/release26-maint/Modules/_ctypes/libffi/configure.ac

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Apr 28 22:01:18 2009
@@ -27,6 +27,8 @@
 Library
 -------
 
+- Issue #4305: ctypes should now build again on mipsel-linux-gnu
+
 - Issue #5853: calling a function of the mimetypes module from several threads
   at once could hit the recursion limit if the mimetypes database hadn't been
   initialized before.

Modified: python/branches/release26-maint/Modules/_ctypes/libffi/configure
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/libffi/configure	(original)
+++ python/branches/release26-maint/Modules/_ctypes/libffi/configure	Tue Apr 28 22:01:18 2009
@@ -20426,10 +20426,10 @@
 	;;
 
   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 @@
    { (exit 1); exit 1; }; }
 fi
 
- if test x$TARGET = xMIPS; then
+ if expr x$TARGET : 'xMIPS' > /dev/null; then
   MIPS_TRUE=
   MIPS_FALSE='#'
 else

Modified: python/branches/release26-maint/Modules/_ctypes/libffi/configure.ac
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/libffi/configure.ac	(original)
+++ python/branches/release26-maint/Modules/_ctypes/libffi/configure.ac	Tue Apr 28 22:01:18 2009
@@ -106,10 +106,10 @@
 	;;
 
   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 @@
   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)