Subject: Re: CVS commit: pkgsrc/devel/bmake
To: Todd Vierling <tv@duh.org>
From: Simon Gerraty <sjg@juniper.net>
List: pkgsrc-changes
Date: 11/02/2005 12:13:05
Ah ok, thanks. My guess would be a cvs merge conflict screwup on my
part ;-)
Will double check all these.
Thanks
--sjg
On Wed, 2 Nov 2005 14:28:33 -0500 (EST), Todd Vierling writes:
>On Wed, 2 Nov 2005, Simon Gerraty wrote:
>
>> I don't follow. The code in usr.bin/make is:
>>
>> if (done ||
>> WIFSTOPPED(*status) ||
>> (WIFSIGNALED(*status) && (WTERMSIG(*status) == SIGCONT)))
>> {
>>
>> the code in bmake is:
>>
>> if (done ||
>> WIFSTOPPED(status) ||
>> (WIFSIGNALED(status) && (WTERMSIG(status) == SIGCONT)))
>> {
>
>Wrong conditional. See rev. 1.2 of pkgsrc/devel/bmake, where I fixed the
>problem:
>
>@@ -1109,7 +1109,7 @@
> #endif
> (void)fflush(out);
> return;
>- } else if (WIFSTOPPED(status) && WTERMSIG(status) == SIGCONT) {
>+ } else if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGCONT) {
> /*
> * If the beastie has continued, shift the Job from the stopped
> * list to the running one (or re-stop it if concurrency is
>
>--
>-- Todd Vierling <tv@duh.org> <tv@pobox.com> <todd@vierling.name>