bug-make
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] RISC OS Support


From: Peter Naulls
Subject: [PATCH] RISC OS Support
Date: Sat, 27 Mar 2004 11:34:59 GMT
User-agent: Messenger-Pro/2.62 (MsgServe/2.05) (RISC-OS/4.37) POPstar/2.04-pre5

I believe this is the appropriate address.  Apologies if not.

These patches make GNU Make 3.80 work correctly under the Acorn RISC OS
operating system.

--- make-3.80/job.c.orig        2004-03-27 11:01:56.000000000 +0000
+++ make-3.80/job.c     2004-03-27 11:23:36.000000000 +0000
@@ -51,7 +51,11 @@
 #    include <descrip.h>
 char default_shell[] = "";
 #   else
+#    ifdef __riscos__
+char default_shell[] = "";
+#    else /* RISC OS */
 char default_shell[] = "/bin/sh";
+#    endif
 #   endif /* VMS */
 #  endif /* __MSDOS__ */
 int batch_mode_shell = 0;
@@ -1609,7 +1613,7 @@
 static int
 load_too_high ()
 {
-#if defined(__MSDOS__) || defined(VMS) || defined(_AMIGA)
+#if defined(__MSDOS__) || defined(VMS) || defined(_AMIGA) || 
defined(__riscos__)
   return 1;
 #else
   double load;
@@ -2479,12 +2483,17 @@
   char*  sh_chars;
   char** sh_cmds;
 #else  /* must be UNIX-ish */
+#ifdef __riscos__
+  static char sh_chars[] = "";
+  static char *sh_cmds[] = { 0 };
+#else  /* must be UNIX-ish */
   static char sh_chars[] = "#;\"*?[]&|<>(){}$`^~";
   static char *sh_cmds[] = { "cd", "eval", "exec", "exit", "login",
                             "logout", "set", "umask", "wait", "while", "for",
                             "case", "if", ":", ".", "break", "continue",
                             "export", "read", "readonly", "shift", "times",
                             "trap", "switch", 0 };
+#endif /* __riscos__ */
 #endif /* WINDOWS32 */
 #endif /* Amiga */
 #endif /* __MSDOS__ */
--- make-3.80/getloadavg.c.orig 2003-02-22 19:21:44.000000000 +0000
+++ make-3.80/getloadavg.c      2003-02-22 19:22:33.000000000 +0000 @@ -355,7 
+355,7 @@
 
 /* LOAD_AVE_TYPE should only get defined if we're going to use the
    nlist method.  */
-# if !defined(LOAD_AVE_TYPE) && (defined(BSD) || defined(LDAV_CVT) || 
defined(KERNEL_FILE) || defined(LDAV_SYMBOL))
+# if !defined(LOAD_AVE_TYPE) && (defined(BSD) || defined(LDAV_CVT) || 
defined(KERNEL_FILE) || defined(LDAV_SYMBOL)) && !defined(__riscos__)
 #  define LOAD_AVE_TYPE double
 # endif
 


-- 
Peter Naulls - address@hidden        | http://www.chocky.org/
----------------------------------------------------------------------------
Drobe - http://www.drobe.co.uk/        | The Premier RISC OS News Site




reply via email to

[Prev in Thread] Current Thread [Next in Thread]