summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-30 14:55:30 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-30 14:55:30 (GMT)
commitb41947b6603a22f2175bc9916fddd5098fe00a31 (patch)
tree474ea00dd3bb6182b5765c18b708889e2686a26a
parent183515c5d4baff4c794072a6196a86564ad1ddc5 (diff)
downloadcpython-b41947b6603a22f2175bc9916fddd5098fe00a31.zip
cpython-b41947b6603a22f2175bc9916fddd5098fe00a31.tar.gz
cpython-b41947b6603a22f2175bc9916fddd5098fe00a31.tar.bz2
Merged revisions 84366 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84366 | antoine.pitrou | 2010-08-30 16:52:00 +0200 (lun., 30 août 2010) | 5 lines Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by Sébastien Sablé. ........
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rwxr-xr-xconfigure10
-rw-r--r--configure.in3
4 files changed, 14 insertions, 3 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index f65df52..293188c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -682,6 +682,7 @@ Jeff Rush
Sam Rushing
Mark Russell
Nick Russo
+Sébastien Sablé
Hajime Saitou
George Sakkis
Rich Salz
diff --git a/Misc/NEWS b/Misc/NEWS
index fe04f43..1fa1522 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -523,6 +523,9 @@ Tests
Build
-----
+- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x. Patch by
+ Sébastien Sablé.
+
- Display installer warning that Windows 2000 won't be supported in future
releases.
diff --git a/configure b/configure
index 8f53afe..5f4e6d1 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 81509 .
+# From configure.in Revision: 81582 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7.
#
@@ -8926,6 +8926,10 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
;;
+ AIX/6)
+$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
+
+ ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
@@ -14219,8 +14223,8 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
_ACEOF
diff --git a/configure.in b/configure.in
index 13fbbed..cbcbbf0 100644
--- a/configure.in
+++ b/configure.in
@@ -2343,6 +2343,9 @@ if test "$posix_threads" = "yes"; then
AIX/5) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
[Define if the Posix semaphores do not work on your system])
;;
+ AIX/6) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
+ Define if the Posix semaphores do not work on your system)
+ ;;
esac
AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)