diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-08-05 22:00:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-08-05 22:00:58 (GMT) |
| commit | aa01137e0e936cc97ab7ba3c80ab39b7772938f0 (patch) | |
| tree | 56e6c4e66ddff63d098281e220a414f4d18ffc04 | |
| parent | c5ef7f0df97b7cc9452e449957462cd0dbbe373c (diff) | |
| parent | 4fa8d0b58071c8c666a320ef21813e12303c3564 (diff) | |
| download | tcl-aa01137e0e936cc97ab7ba3c80ab39b7772938f0.zip tcl-aa01137e0e936cc97ab7ba3c80ab39b7772938f0.tar.gz tcl-aa01137e0e936cc97ab7ba3c80ab39b7772938f0.tar.bz2 | |
Mark unixforkevent-1.1 nonPortable, until proven on more platforms.
Make sure that when testing for pthread_atfork the thread library is taken into account.
| -rw-r--r-- | tests/unixForkEvent.test | 2 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 | ||||
| -rw-r--r-- | unix/tclUnixTest.c | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/tests/unixForkEvent.test b/tests/unixForkEvent.test index cbe582e..120f362 100644 --- a/tests/unixForkEvent.test +++ b/tests/unixForkEvent.test @@ -16,7 +16,7 @@ testConstraint testfork [llength [info commands testfork]] # Test if the notifier thread is well initialized in a forked interpreter # by Tcl_InitNotifier test unixforkevent-1.1 {fork and test writeable event} \ - -constraints testfork \ + -constraints {testfork nonPortable} \ -body { set myFolder [makeDirectory unixtestfork] set pid [testfork] diff --git a/unix/configure b/unix/configure index 8779d7f..9b3c298 100755 --- a/unix/configure +++ b/unix/configure @@ -4821,6 +4821,9 @@ echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you m # Does the pthread-implementation provide # 'pthread_attr_setstacksize' ? + ac_saved_libs=$LIBS + LIBS="$LIBS $THREADS_LIBS" + for ac_func in pthread_attr_setstacksize pthread_atfork do @@ -4923,6 +4926,7 @@ _ACEOF fi done + LIBS=$ac_saved_libs else TCL_THREADS=0 fi diff --git a/unix/tcl.m4 b/unix/tcl.m4 index f12d0a8..194cf90 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -676,7 +676,11 @@ AC_DEFUN([SC_ENABLE_THREADS], [ # Does the pthread-implementation provide # 'pthread_attr_setstacksize' ? + + ac_saved_libs=$LIBS + LIBS="$LIBS $THREADS_LIBS" AC_CHECK_FUNCS(pthread_attr_setstacksize pthread_atfork) + LIBS=$ac_saved_libs else TCL_THREADS=0 fi diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c index f64a29e..b3e07a4 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -566,8 +566,8 @@ TestforkObjCmd( "Cannot fork", NULL); return TCL_ERROR; } -#ifndef HAVE_PTHREAD_ATFORK - /* Only needed when pthread_atfork is not present. */ +#if !defined(HAVE_PTHREAD_ATFORK) || defined(MAC_OSX_TCL) + /* Only needed when pthread_atfork is not present or on OSX. */ if (pid==0) { Tcl_InitNotifier(); } |