Re: Pkgsrc patches: patch-aj

[Neil Jerram]

Greg Troxel <address@hidden> writes:

> Neil Jerram <address@hidden> writes:
>
> I have looked at this in more detail, to understand more precisely what
> pkgsrc changed, in order to make sure I'm not suggesting that we throw
> out a fix to an actual problem.

Thanks for your time on this!

>> The include isn't needed here, because errno.h was already included
>> earlier on in the same file.
>
> Agreed, so I will remove the include from patch-aj (which dates from 1.6).

Cool.

> I did a build with the following patch instead:
>
> $NetBSD$
>
> --- libguile/_scm.h.orig      2008-02-06 08:09:18.000000000 -0500
> +++ libguile/_scm.h
> @@ -95,14 +95,6 @@
>  # define SCM_SYSCALL(line) line;
>  #endif /* ndef SCM_SYSCALL */
>  
> -#if !defined (MSDOS) && !defined (__MINGW32__)
> -# ifdef ARM_ULIB
> -    extern volatile int errno;
> -# else
> -    extern int errno;
> -# endif /* def ARM_ULIB */
> -#endif /* ndef MSDOS && ndef __MINGW32__*/
> -
>  
>  
>  #ifndef min
>
> and then 1.8.4 builds and 'make check's ok on NetBSD-current i386.
>
> I have put the above patch into pkgsrc, and I think it should be applied
> in guile.

Yes, that works fine for me too on GNU/Linux, and I can't imagine any
system where it won't - so I've committed this change now to CVS.

       Neil