diff options
Diffstat (limited to 'devel/boost-jam')
| -rw-r--r-- | devel/boost-jam/distinfo | 6 | ||||
| -rw-r--r-- | devel/boost-jam/files/patch-execunix.c | 56 |
2 files changed, 3 insertions, 59 deletions
diff --git a/devel/boost-jam/distinfo b/devel/boost-jam/distinfo index 136eb633d89b..8653f3ea361d 100644 --- a/devel/boost-jam/distinfo +++ b/devel/boost-jam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523454535 -SHA256 (boost_1_67_0.tar.bz2) = 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba -SIZE (boost_1_67_0.tar.bz2) = 87336566 +TIMESTAMP = 1533158517 +SHA256 (boost_1_68_0.tar.bz2) = 7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 +SIZE (boost_1_68_0.tar.bz2) = 92155315 diff --git a/devel/boost-jam/files/patch-execunix.c b/devel/boost-jam/files/patch-execunix.c deleted file mode 100644 index 1d0e0db798be..000000000000 --- a/devel/boost-jam/files/patch-execunix.c +++ /dev/null @@ -1,56 +0,0 @@ ---- execunix.c.orig 2017-12-13 23:56:50 UTC -+++ execunix.c -@@ -445,9 +445,7 @@ void exec_wait() - while ( !finished ) - { - int i; -- struct timeval tv; -- struct timeval * ptv = NULL; -- int select_timeout = globs.timeout; -+ int poll_timeout = -1; - - /* Check for timeouts: - * - kill children that already timed out -@@ -457,6 +455,7 @@ void exec_wait() - { - struct tms buf; - clock_t const current = times( &buf ); -+ poll_timeout = globs.timeout; - for ( i = 0; i < globs.jobs; ++i ) - if ( cmdtab[ i ].pid ) - { -@@ -467,28 +466,21 @@ void exec_wait() - killpg( cmdtab[ i ].pid, SIGKILL ); - cmdtab[ i ].exit_reason = EXIT_TIMEOUT; - } -- else if ( globs.timeout - consumed < select_timeout ) -- select_timeout = globs.timeout - consumed; -+ else if ( globs.timeout - consumed < poll_timeout ) -+ poll_timeout = globs.timeout - consumed; - } -- -- /* If nothing else causes our select() call to exit, force it after -- * however long it takes for the next one of our child processes to -- * crossed its alloted processing time so we can terminate it. -- */ -- tv.tv_sec = select_timeout; -- tv.tv_usec = 0; -- ptv = &tv; -+ poll_timeout *= 1000; - } - -- /* select() will wait for I/O on a descriptor, a signal, or timeout. */ -+ /* poll() will wait for I/O on a descriptor, a signal, or timeout. */ - { -- /* disable child termination signals while in select */ -+ /* disable child termination signals while in poll */ - int ret; - sigset_t sigmask; - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGCHLD); - sigprocmask(SIG_BLOCK, &sigmask, NULL); -- while ( ( ret = poll( wait_fds, WAIT_FDS_SIZE, select_timeout * 1000 ) ) == -1 ) -+ while ( ( ret = poll( wait_fds, WAIT_FDS_SIZE, poll_timeout ) ) == -1 ) - if ( errno != EINTR ) - break; - /* restore original signal mask by unblocking sigchld */ |