From: Martin v. Löwis Date: Mon, 15 Feb 2010 21:43:41 +0000 (+0000) Subject: Merged revisions 78202 via svnmerge from X-Git-Tag: v2.6.5rc1~66 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c5e2c8e98292baa0894cf7e5b3a4cba6808a2c9;p=python Merged revisions 78202 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78202 | martin.v.loewis | 2010-02-15 22:41:12 +0100 (Mo, 15 Feb 2010) | 2 lines Issue #7903: Define _BSD_SOURCE through OpenBSD 4.9. ........ --- diff --git a/Misc/NEWS b/Misc/NEWS index 03267edef6..0778518325 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -215,7 +215,7 @@ Extension Modules Build ----- -- Issue #3920: Define _BSD_SOURCE on OpenBSD 4.4. +- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. - Issue #7661: Allow ctypes to be built from a non-ASCII directory path. Patch by Florent Xicluna. diff --git a/configure b/configure index f678a1e277..ee6f439b07 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 78155 . +# From configure.in Revision: 78195 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.6. # @@ -2112,7 +2112,9 @@ case $ac_sys_system/$ac_sys_release in # 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/4.[0123]) + # In addition, Stefan Krah confirms that issue #1244610 exists through + # OpenBSD 4.6, but is fixed in 4.7. + OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123456]) define_xopen_source=no # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE @@ -2123,7 +2125,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF ;; - OpenBSD/4.[4]) + OpenBSD/4.[789]) # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE # As this has a different meaning on Linux, only define it on OpenBSD diff --git a/configure.in b/configure.in index 66da672cbe..5a5ccd007a 100644 --- a/configure.in +++ b/configure.in @@ -278,14 +278,16 @@ case $ac_sys_system/$ac_sys_release in # 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/4.@<:@0123@:>@) + # In addition, Stefan Krah confirms that issue #1244610 exists through + # OpenBSD 4.6, but is fixed in 4.7. + OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123456@:>@) define_xopen_source=no # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE # As this has a different meaning on Linux, only define it on OpenBSD AC_DEFINE(_BSD_SOURCE, 1, [Define on OpenBSD to activate all library features]) ;; - OpenBSD/4.@<:@4@:>@) + OpenBSD/4.@<:@789@:>@) # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE # As this has a different meaning on Linux, only define it on OpenBSD