[Python-checkins] r84586 - in python/branches/release31-maint: Misc/NEWS configure configure.in pyconfig.h.in setup.py
antoine.pitrou
python-checkins at python.org
Tue Sep 7 16:58:51 CEST 2010
Author: antoine.pitrou
Date: Tue Sep 7 16:58:50 2010
New Revision: 84586
Log:
Merged revisions 84584 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84584 | antoine.pitrou | 2010-09-07 16:52:42 +0200 (mar., 07 sept. 2010) | 4 lines
Issue #4026: Make the fcntl extension build under AIX.
Patch by Sébastien Sablé.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Misc/NEWS
python/branches/release31-maint/configure
python/branches/release31-maint/configure.in
python/branches/release31-maint/pyconfig.h.in
python/branches/release31-maint/setup.py
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Tue Sep 7 16:58:50 2010
@@ -535,6 +535,9 @@
Build
-----
+- Issue #4026: Make the fcntl extension build under AIX. Patch by Sébastien
+ Sablé.
+
- Issue #3101: Helper functions _add_one_to_index_C() and
_add_one_to_index_F() become _Py_add_one_to_index_C() and
_Py_add_one_to_index_F(), respectively.
Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure (original)
+++ python/branches/release31-maint/configure Tue Sep 7 16:58:50 2010
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 82963 .
+# From configure.in Revision: 84367 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.1.
#
@@ -9410,6 +9410,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock" >&5
$as_echo_n "checking for flock... " >&6; }
+have_flock=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -9426,16 +9427,89 @@
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
+
$as_echo "#define HAVE_FLOCK 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
+ have_flock=yes
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_flock" >&5
+$as_echo "$have_flock" >&6; }
+
+if test "$have_flock" = yes ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if flock requires additional libraries." >&5
+$as_echo_n "checking if flock requires additional libraries.... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include "confdefs.h"
+ #include <sys/file.h>
+
+int
+main ()
+{
+flock(0, 0)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
+$as_echo_n "checking for flock in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_flock+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char flock ();
+int
+main ()
+{
+return flock ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_flock=yes
+else
+ ac_cv_lib_bsd_flock=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5
+$as_echo "$ac_cv_lib_bsd_flock" >&6; }
+if test "x$ac_cv_lib_bsd_flock" = x""yes; then :
+
+
+$as_echo "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h
+
+
+fi
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
$as_echo_n "checking for getpagesize... " >&6; }
Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in (original)
+++ python/branches/release31-maint/configure.in Tue Sep 7 16:58:50 2010
@@ -2642,14 +2642,29 @@
)
AC_MSG_CHECKING(for flock)
+have_flock=no
AC_TRY_COMPILE([
#include "confdefs.h"
#include <sys/file.h>
-], void* p = flock,
+], void* p = flock, [
AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no)
-)
+ have_flock=yes
+])
+AC_MSG_RESULT($have_flock)
+
+if test "$have_flock" = yes ; then
+ AC_MSG_CHECKING(if flock requires additional libraries.)
+ AC_TRY_LINK([
+ #include "confdefs.h"
+ #include <sys/file.h>
+ ], [flock(0, 0)],
+ AC_MSG_RESULT(no), [
+ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(bsd,flock, [
+ AC_DEFINE(FLOCK_NEEDS_LIBBSD, 1, Define if flock needs to be linked with bsd library.)
+ ])
+ ])
+fi
AC_MSG_CHECKING(for getpagesize)
AC_TRY_COMPILE([
Modified: python/branches/release31-maint/pyconfig.h.in
==============================================================================
--- python/branches/release31-maint/pyconfig.h.in (original)
+++ python/branches/release31-maint/pyconfig.h.in Tue Sep 7 16:58:50 2010
@@ -33,6 +33,9 @@
/* Define if --enable-ipv6 is specified */
#undef ENABLE_IPV6
+/* Define if flock needs to be linked with bsd library */
+#undef FLOCK_NEEDS_LIBBSD
+
/* Define if getpgrp() must be called as getpgrp(0). */
#undef GETPGRP_HAVE_ARG
Modified: python/branches/release31-maint/setup.py
==============================================================================
--- python/branches/release31-maint/setup.py (original)
+++ python/branches/release31-maint/setup.py Tue Sep 7 16:58:50 2010
@@ -489,7 +489,11 @@
# supported...)
# fcntl(2) and ioctl(2)
- exts.append( Extension('fcntl', ['fcntlmodule.c']) )
+ libs = []
+ if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
+ # May be necessary on AIX for flock function
+ libs = ['bsd']
+ exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
if platform not in ['mac']:
# pwd(3)
exts.append( Extension('pwd', ['pwdmodule.c']) )
More information about the Python-checkins
mailing list