Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.3.

This commit is contained in:
Stefan Krah 2012-11-22 22:57:54 +01:00
parent 60dd6e538f 7dba5940ae
commit 8cb9e2e073
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -6562,6 +6562,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -6617,6 +6618,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -6666,6 +6668,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -6715,6 +6718,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -9323,6 +9327,8 @@ $as_echo "$unistd_defines_pthreads" >&6; }
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <pthread.h>
void * start_routine (void *arg) { exit (0); }
@ -9672,7 +9678,9 @@ else
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
#include <stdio.h>
#include <pthread.h>
void *foo(void *parm) {
return NULL;
}

12
configure.ac
View File

@ -1345,6 +1345,7 @@ fi
AC_MSG_CHECKING(whether pthreads are available without options)
AC_CACHE_VAL(ac_cv_pthread_is_default,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -1379,6 +1380,7 @@ AC_CACHE_VAL(ac_cv_kpthread,
[ac_save_cc="$CC"
CC="$CC -Kpthread"
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -1407,6 +1409,7 @@ AC_CACHE_VAL(ac_cv_kthread,
[ac_save_cc="$CC"
CC="$CC -Kthread"
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -1435,6 +1438,7 @@ AC_CACHE_VAL(ac_cv_thread,
[ac_save_cc="$CC"
CC="$CC -pthread"
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <pthread.h>
void* routine(void* p){return NULL;}
@ -2356,7 +2360,9 @@ yes
_libs=$LIBS
LIBS="$LIBS -lpthread"
AC_MSG_CHECKING([for pthread_create in -lpthread])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include <pthread.h>
void * start_routine (void *arg) { exit (0); }]], [[
pthread_create (NULL, NULL, start_routine, NULL)]])],[
@ -2422,7 +2428,9 @@ if test "$posix_threads" = "yes"; then
AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
AC_CACHE_VAL(ac_cv_pthread_system_supported,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <pthread.h>
void *foo(void *parm) {
return NULL;
}