Re: Patch cfengine-2.0.7p1

[Akop Pogosian]

On Thu, May 22, 2003 at 06:57:02PM +0200, Mark.Burgess@iu.hio.no wrote:
>  22 May, Dave Love wrote:
> > Mark Burgess <Mark.Burgess@iu.hio.no> writes:
> > 
> >> On 22 May, Fredrik Jagenheim wrote:
> >>> On Wed, May 21, 2003 at 04:17:51PM +0200, Mark.Burgess@iu.hio.no wrote:
> >>>> 
> >>>> Ah - right, I have to actually add it to the distlist! Thanks,
> >>>> try p2 now in a minute
> >>> 
> >>> p2 fails when it tries to compile getloadavg.c on SunOS_5.6.
> >>> 
> >>> Adding '#define NLIST_STRUCT 1' to src/conf.h fixes this problem, but
> >>> I don't know enough about autoconf and friends to fix it 'properly'.
> > 
> > I forgot that the autoconf testing is currently somewhat inconsistent
> > with the getloadavg implementation.  This should do the trick.  I
> > don't have a sunos2.6 system to try it on.
> > 
> > *** pub/getloadavg.c~       Wed May 21 15:26:33 2003
> > --- pub/getloadavg.c        Thu May 22 15:29:09 2003
> > ***************
> > *** 76,81 ****
> > --- 76,85 ----
> >   
> >   #include "../src/conf.h"
> >   
> > + #ifdef HAVE_NLIST_H               /* What autoconf defines.  */
> > + # undef NLIST_STRUCT
> > + # define NLIST_STRUCT
> > + #endif
> >   
> >   #include <sys/types.h>
> >   
> 
> 
> I don't really understand this. Solaris has nlist.h but HAVE_NLIST_H
> does not get defined.
> 
> M
> 

I am compiling cfengine 2.0.7p2 on Solaris 2.6 and HAVE_NLIST_H is
defined there. However, NLIST_STRUCT is not defined. Does HAVE_NLIST_H
automatically imply that NLIST_STRUCT should be defined too as the
patch above suggests? Comments in pub/getloadavg.c suggest that
NLIST_STRUCT should be defined when nlist.h exists and nlist n_name
element is a pointer. Both are true on Solaris 2.6.

Also, by the way, I noticed the generated Makefile adds -pthreads
option to CFLAGS.  -pthreads is valid with gcc 3.x only. If this is
intentional, the docs should probably say that gcc-3.x is now required
to build cfengine.


-akop