Re: [ pkg-hurd-Patches-301184 ] FTBFS - nas-1.7

[Michael Banck <mbanck@debian.org>]

On Wed, Apr 13, 2005 at 01:38:08AM +0200, Michael Banck wrote:
> > diff -urp nas-1.7.old/server/Imakefile nas-1.7/server/Imakefile
> > --- nas-1.7.old/server/Imakefile        2005-02-07 08:44:41.000000000 -0500
> > +++ nas-1.7/server/Imakefile    2005-02-07 08:42:37.000000000 -0500
> > @@ -91,7 +91,7 @@ RCMANDIR = $(MANDIR)
> >  #define BuildSGIServer
> >  #endif
> > 
> > -#if defined(HPArchitecture) && !defined(LinuxArchitecture) && !defined(GNUArchitecture)
> > +#if defined(HPArchitecture) && !defined(LinuxArchitecture) && !defined(GNUArchitecture) && !defined(GNUMachArchitecture)
> 
> Xfree86's Imake config stuff has this (in xc/config/cf/Imake.cf):
> 
> #ifdef MACH
> #ifdef __GNU__
> #define MacroIncludeFile <gnu.cf>
> #define MacroFile gnu.cf
> #define GNUMachArchitecture
> 
> while there is no mention of GNUArchitecture AFAICT.  So I guess
> GNUArchitecture is either outdated, bogus or wrong and should simply be replaced by GNUMachArchitecture.

Actually, GNUArchitecture appears to be additionally defined by X.Org:

/* Systems with GNU libc and userland */
#if defined(__GNU__) || defined(__GNU_userland__) || \
  defined(__GNU_KFreeBSD__) || \
  defined(__GNU_KNetBSD__) || defined(__GNU_KOpenBSD__)
#define GNUArchitecture
#define MacroIncludeFile <gnu.cf>
#define MacroFile gnu.cf

So, Barry's original patch is better as it works on both XFree86 and
X.Org.


Michael

-- 
Michael Banck
Debian Developer
mbanck@debian.org
http://www.advogato.org/person/mbanck/diary.html