summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew MacIntyre <andymac@bullseye.apana.org.au>2003-07-02 13:53:25 (GMT)
committerAndrew MacIntyre <andymac@bullseye.apana.org.au>2003-07-02 13:53:25 (GMT)
commitabccf41a7d616cc950510ad4a3526b11e012ee24 (patch)
tree95e76292081a25e4e1a258abcba47c64018a3479
parent1ec0bdf899d5aa55f888cae3e48316bdc3b8635e (diff)
downloadcpython-abccf41a7d616cc950510ad4a3526b11e012ee24.zip
cpython-abccf41a7d616cc950510ad4a3526b11e012ee24.tar.gz
cpython-abccf41a7d616cc950510ad4a3526b11e012ee24.tar.bz2
FreeBSD 5.x has moved some library routines and typedefs outside the
scope of the _XOPEN_SOURCE and _POSIX_C_SOURCE symbols, including: - getloadavg() - typedefs for u_int, u_long, u_char, u_short, ushort & uint These are now all defined under the control of a __BSD_VISIBLE symbol. The lack of the typedefs causes several extension modules to build incorrectly or not at all, and is the cause of failures reported for test_socket and test_tempfile on this platform (see python-dev: 29/6/03, pieterb@gewis.nl, "Running tests on freebsd5") This change does not appear to be needed in the 2.2 branch.
-rwxr-xr-xconfigure15
-rw-r--r--configure.in5
-rw-r--r--pyconfig.h.in3
3 files changed, 20 insertions, 3 deletions
diff --git a/configure b/configure
index ef183c7..257e547 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.418 .
+# From configure.in Revision: 1.419 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53 for python 2.3.
#
@@ -908,7 +908,7 @@ esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
@@ -1265,6 +1265,15 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
+# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
+# them.
+
+cat >>confdefs.h <<\_ACEOF
+#define __BSD_VISIBLE 1
+_ACEOF
+
+
define_xopen_source=yes
# Arguments passed to configure.
@@ -18441,7 +18450,7 @@ esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
diff --git a/configure.in b/configure.in
index bfe1e38..b80086c 100644
--- a/configure.in
+++ b/configure.in
@@ -45,6 +45,11 @@ AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate all library features])
# them.
AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
+# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
+# them.
+AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
+
define_xopen_source=yes
# Arguments passed to configure.
diff --git a/pyconfig.h.in b/pyconfig.h.in
index e0e2f5b..0a58278 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -829,6 +829,9 @@
/* Define on NetBSD to activate all library features */
#undef _NETBSD_SOURCE
+/* Define on FreeBSD to activate all library features */
+#undef __BSD_VISIBLE
+
/* Define _OSF_SOURCE to get the makedev macro. */
#undef _OSF_SOURCE