Merged revisions 78196 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78196 | martin.v.loewis | 2010-02-15 09:35:16 +0100 (Mo, 15 Feb 2010) | 9 lines

  Merged revisions 78194 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78194 | martin.v.loewis | 2010-02-15 09:32:00 +0100 (Mo, 15 Feb 2010) | 2 lines

    Issue #3920: Define _BSD_SOURCE on OpenBSD 4.4.
  ........
................

diff --git a/Misc/NEWS b/Misc/NEWS
index f764d12832f9202ce6eaad1b44102c45df5b153a..c3245b8c6be168fc35be51b061cf29e132302b3d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,6 +366,8 @@ C-API
 Build
 -----
 
+- Issue #3920: Define _BSD_SOURCE on OpenBSD 4.4.
+
 - Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the
   private memory allocation scheme in dtoa.c and use PyMem_Malloc and
   PyMem_Free instead.  Also disable caching of powers of 5.

diff --git a/configure b/configure
index 7aae1257be36b8c65e78d57fae01c64c1b78261d..bae822ba6f995e98175b5bc7928173cea8a09d69 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 78153 .
+# From configure.in Revision: 78157 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -2112,6 +2112,16 @@ case $ac_sys_system/$ac_sys_release in
     # also defined. This can be overridden by defining _BSD_SOURCE
     # As this has a different meaning on Linux, only define it on OpenBSD
 
+cat >>confdefs.h <<\_ACEOF
+#define _BSD_SOURCE 1
+_ACEOF
+
+    ;;
+  OpenBSD/4.[4])
+    # 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
+
 cat >>confdefs.h <<\_ACEOF
 #define _BSD_SOURCE 1
 _ACEOF
@@ -3823,7 +3833,7 @@ else
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 
@@ -5371,7 +5381,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -5392,7 +5402,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -6490,7 +6500,7 @@ _ACEOF
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
 echo "${ECHO_T}$was_it_defined" >&6; }
@@ -7020,7 +7030,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_type_uid_t=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -14435,7 +14445,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   unistd_defines_pthreads=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
 echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -15903,7 +15913,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "yes" >/dev/null 2>&1; then
   ipv6type=$i
 fi
-rm -f -r conftest*
+rm -f conftest*
 
                        ;;
                kame)
@@ -15926,7 +15936,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6libdir=/usr/local/v6/lib
                                ipv6trylibc=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
                        ;;
                linux-glibc)
@@ -15947,7 +15957,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   ipv6type=$i;
                                ipv6trylibc=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
                        ;;
                linux-inet6)
@@ -15985,7 +15995,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6lib=inet6;
                                ipv6libdir=/usr/local/v6/lib
 fi
-rm -f -r conftest*
+rm -f conftest*
 
                        ;;
                v6d)
@@ -16008,7 +16018,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6libdir=/usr/local/v6/lib;
                                BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f -r conftest*
+rm -f conftest*
 
                        ;;
                zeta)
@@ -16030,7 +16040,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6lib=inet6;
                                ipv6libdir=/usr/local/v6/lib
 fi
-rm -f -r conftest*
+rm -f conftest*
 
                        ;;
                esac
@@ -24283,7 +24293,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24302,7 +24312,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -24572,7 +24582,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 

diff --git a/configure.in b/configure.in
index 0022d023d8ebe337b5406ee39f3815824ff9a27a..3d3d4a17cd473f21f1c159a53bc06e94e1cc9dd5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -283,6 +283,12 @@ case $ac_sys_system/$ac_sys_release in
     # 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 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])
+    ;;
   # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of
   # _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by
   # Marc Recht