[Python-checkins] r51727 - in python/branches/release25-maint: Lib/test/test_fcntl.py Lib/test/test_tempfile.py Misc/NEWS configure configure.in

[neal.norwitz]

Author: neal.norwitz
Date: Tue Sep  5 04:54:42 2006
New Revision: 51727

Modified:
   python/branches/release25-maint/Lib/test/test_fcntl.py
   python/branches/release25-maint/Lib/test/test_tempfile.py
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/configure
   python/branches/release25-maint/configure.in
Log:
Patch #1540470, for OpenBSD 4.0.  Backport candidate for 2.[34].

Modified: python/branches/release25-maint/Lib/test/test_fcntl.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_fcntl.py	(original)
+++ python/branches/release25-maint/Lib/test/test_fcntl.py	Tue Sep  5 04:54:42 2006
@@ -25,7 +25,7 @@
                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                     'freebsd6', 'freebsd7',
                     'bsdos2', 'bsdos3', 'bsdos4',
-                    'openbsd', 'openbsd2', 'openbsd3'):
+                    'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
     if struct.calcsize('l') == 8:
         off_t = 'l'
         pid_t = 'i'

Modified: python/branches/release25-maint/Lib/test/test_tempfile.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_tempfile.py	(original)
+++ python/branches/release25-maint/Lib/test/test_tempfile.py	Tue Sep  5 04:54:42 2006
@@ -27,7 +27,7 @@
 # number of files that can be opened at one time (see ulimit -n)
 if sys.platform == 'mac':
     TEST_FILES = 32
-elif sys.platform == 'openbsd3':
+elif sys.platform in ('openbsd3', 'openbsd4'):
     TEST_FILES = 48
 else:
     TEST_FILES = 100

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Sep  5 04:54:42 2006
@@ -69,6 +69,8 @@
 Build
 -----
 
+- Patch #1540470, for OpenBSD 4.0.
+
 - Patch #1545507: Exclude ctypes package in Win64 MSI file.
 
 - Fix OpenSSL debug build process.

Modified: python/branches/release25-maint/configure
==============================================================================
--- python/branches/release25-maint/configure	(original)
+++ python/branches/release25-maint/configure	Tue Sep  5 04:54:42 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 47267 .
+# From configure.in Revision: 51173 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -1553,7 +1553,7 @@
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.[0123456789])
+  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0])
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.

Modified: python/branches/release25-maint/configure.in
==============================================================================
--- python/branches/release25-maint/configure.in	(original)
+++ python/branches/release25-maint/configure.in	Tue Sep  5 04:54:42 2006
@@ -201,7 +201,7 @@
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@) 
+  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0@:>@) 
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.