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.
........
This commit is contained in:
Martin v. Löwis 2010-02-15 08:35:16 +00:00
parent bbe63069ef
commit 7671efc126
3 changed files with 34 additions and 16 deletions

View file

@ -682,6 +682,8 @@ Extension Modules
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.

42
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 78152 .
# From configure.in Revision: 78156 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@ -2106,6 +2106,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
@ -3817,7 +3827,7 @@ else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
rm -f -r conftest*
rm -f conftest*
@ -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
@ -5413,7 +5423,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
@ -6513,7 +6523,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; }
@ -7043,7 +7053,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
@ -15712,7 +15722,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; }
@ -17010,7 +17020,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)
@ -17033,7 +17043,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)
@ -17054,7 +17064,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6type=$i;
ipv6trylibc=yes
fi
rm -f -r conftest*
rm -f conftest*
;;
linux-inet6)
@ -17092,7 +17102,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)
@ -17115,7 +17125,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)
@ -17137,7 +17147,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
@ -25652,7 +25662,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
rm -f -r conftest*
rm -f conftest*
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@ -25671,7 +25681,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
rm -f -r conftest*
rm -f conftest*
fi
@ -25941,7 +25951,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
rm -f -r conftest*
rm -f conftest*
fi

View file

@ -280,6 +280,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