gnu/gnumake/make-3.81-aros.diff

   1 diff -ruN make-3.81/arscan.c make-3.81.aros/arscan.c
   2 --- make-3.81/arscan.c  2006-02-11 23:16:04.000000000 +0100
   3 +++ make-3.81.aros/arscan.c     2006-04-01 08:40:00.000000000 +0200
   4 @@ -231,7 +231,7 @@
   5  #endif
   6
   7  #ifndef WINDOWS32
   8 -# ifndef __BEOS__
   9 +# if !defined(__BEOS__) && !defined(__AROS__)
  10  #  include <ar.h>
  11  # else
  12     /* BeOS 5 doesn't have <ar.h> but has archives in the same format
  13 diff -ruN make-3.81/glob/fnmatch.h make-3.81.aros/glob/fnmatch.h
  14 --- make-3.81/glob/fnmatch.h    2006-02-11 21:00:39.000000000 +0100
  15 +++ make-3.81.aros/glob/fnmatch.h       2006-04-01 08:40:00.000000000 +0200
  16 @@ -36,6 +36,9 @@
  17     non-ANSI C where `const' is problematical.  */
  18  #endif /* C++ or ANSI C.  */
  19
  20 +#if defined __AROS__
  21 +# undef __const
  22 +#endif
  23  #ifndef const
  24  # if (defined __STDC__ && __STDC__) || defined __cplusplus || defined WINDOWS32
  25  #  define __const      const
  26 diff -ruN make-3.81/glob/glob.h make-3.81.aros/glob/glob.h
  27 --- make-3.81/glob/glob.h       2006-02-11 21:00:39.000000000 +0100
  28 +++ make-3.81.aros/glob/glob.h  2006-04-01 08:40:00.000000000 +0200
  29 @@ -29,7 +29,7 @@
  30  #  undef __PMT
  31  #  define __P(protos)  protos
  32  #  define __PMT(protos)        protos
  33 -#  if !defined __GNUC__ || __GNUC__ < 2
  34 +#  if !defined __GNUC__ || __GNUC__ < 2 || defined __AROS__
  35  #   undef __const
  36  #   define __const const
  37  #  endif
  38 diff -ruN make-3.81/main.c make-3.81.aros/main.c
  39 --- make-3.81/main.c    2006-03-20 03:36:37.000000000 +0100
  40 +++ make-3.81.aros/main.c       2012-02-01 19:33:29.115929745 +0100
  41 @@ -886,7 +886,7 @@
  42  }
  43
  44
  45 -#ifdef _AMIGA
  46 +#if defined(_AMIGA) || defined(__AROS__)
  47  int
  48  main (int argc, char **argv)
  49  #else
  50 @@ -912,6 +912,10 @@
  51    unixy_shell = 0;
  52    no_default_sh_exe = 1;
  53  #endif
  54 +#ifdef __AROS__
  55 +  extern char **environ;
  56 +  char **envp = environ;
  57 +#endif
  58
  59  #ifdef SET_STACK_SIZE
  60   /* Get rid of any avoidable limit on stack size.  */