Re: pkgsrc bash-4.1 won't build

[Aggelos Economopoulos <aoiko@xxxxxxxxxxxxxx>]

Steve O'Hara-Smith wrote:

>> Yes. Like I exlained above, I don't think removing the code for
>> DragonFly is the correct solution. Unless someone takes the time to
>> audit fpurge(), I suppose using __FILE_public is the safest "fix" since
>> it brings us back to how things were.
> 
> 	So this patch (which works for me):

Kind of. This is nested in another __DragonFly__ test, so plese convert
the test on line 56 to #if defined __sferror ... #elif defined
__DragonFly__ etc. Also, please remove the __DragonFly__ check in line
84, which (presumably) is never reached.

Thanks,
Aggelos

> --- fpurge.c.orig	2010-02-08 17:31:18 +0000
> +++ fpurge.c	2010-02-08 17:32:31 +0000
> @@ -61,8 +61,13 @@
>         If this invariant is not fulfilled and the stream is read-write but
>         currently writing, subsequent putc or fputc calls will write directly
>         into the buffer, although they shouldn't be allowed to.  */
> +#if defined __DragonFly__
> +    if ((((struct __FILE_public *) fp)->_flags & __SRD) != 0)
> +      ((struct __FILE_public *) fp)->_w = 0;
> +#else
>      if ((fp->_flags & __SRD) != 0)
>        fp->_w = 0;
> +#endif
>  # endif
>    return result;
> 
>