summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-12-13 21:10:57 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-12-13 21:10:57 (GMT)
commitba79b35772ab36b3cde0d85c4ec3d1902f47bb79 (patch)
tree7560f4a2515a2793e5ade86b808373440d3c60b4
parentb5314c6583b0500f09c54693ea37d7a7f89c2bdf (diff)
downloadcpython-ba79b35772ab36b3cde0d85c4ec3d1902f47bb79.zip
cpython-ba79b35772ab36b3cde0d85c4ec3d1902f47bb79.tar.gz
cpython-ba79b35772ab36b3cde0d85c4ec3d1902f47bb79.tar.bz2
Merged revisions 76813 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76813 | mark.dickinson | 2009-12-13 21:06:06 +0000 (Sun, 13 Dec 2009) | 3 lines Issue #7492: Autoconf tests were leaving semaphore files behind. Add sem_unlink calls to delete those semaphore files. ........
-rwxr-xr-xconfigure6
-rw-r--r--configure.in4
2 files changed, 7 insertions, 3 deletions
diff --git a/configure b/configure
index f6a675e..dc02225 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 76645 .
+# From configure.in Revision: 76779 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@@ -23782,6 +23782,7 @@ int main(void) {
return 1;
}
sem_close(a);
+ sem_unlink("/autoconf");
return 0;
}
@@ -23856,7 +23857,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/stat.h>
int main(void){
- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+ sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR|S_IWUSR, 0);
int count;
int res;
if(a==SEM_FAILED){
@@ -23866,6 +23867,7 @@ int main(void){
}
res = sem_getvalue(a, &count);
sem_close(a);
+ sem_unlink("/autocftw");
return res==-1 ? 1 : 0;
}
diff --git a/configure.in b/configure.in
index 711856d..af1855e 100644
--- a/configure.in
+++ b/configure.in
@@ -3324,6 +3324,7 @@ int main(void) {
return 1;
}
sem_close(a);
+ sem_unlink("/autoconf");
return 0;
}
], ac_cv_posix_semaphores_enabled=yes,
@@ -3348,7 +3349,7 @@ AC_TRY_RUN([
#include <sys/stat.h>
int main(void){
- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+ sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR|S_IWUSR, 0);
int count;
int res;
if(a==SEM_FAILED){
@@ -3358,6 +3359,7 @@ int main(void){
}
res = sem_getvalue(a, &count);
sem_close(a);
+ sem_unlink("/autocftw");
return res==-1 ? 1 : 0;
}
], ac_cv_broken_sem_getvalue=no,