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

[Bacula-devel] [PATCH] Make bacula(-client) work on IRIX 6.5


Hi,

I just tried to compile bacula-client on IRIX 6.5 and ran into some smaller
issues. I've attached a patchfile which fixes all of them and therefore makes
bacula-fd run fine :-).

Please review it and ensure that it does not break other code.

Thanks and best regards,
Michael

By the way: The compilation flags I've used are:
export CC=cc
export CFLAGS="-n32 -mips4 -xansi -O3 -OPT:Olimit=0:roundoff=3 -TARG:platform=IP27:proc=r10000 -woff 1164,1174"
export LDFLAGS="-L/usr/local/lib32 -rpath /usr/local/lib32"

./configure --prefix=/usr/local \
        --includedir=/usr/local/include \
        --libdir=/usr/local/lib32 \
        --enable-client-only \
        --with-openssl=/usr/local
Index: src/console/authenticate.c
===================================================================
--- src/console/authenticate.c	(revision 7512)
+++ src/console/authenticate.c	(working copy)
@@ -47,10 +47,10 @@
 void sendit(const char *buf);
 
 /* Commands sent to Director */
-static char hello[]    = N_("Hello %s calling\n");
+static char hello[]    = "Hello %s calling\n";
 
 /* Response from Director */
-static char OKhello[]   = N_("1000 OK:");
+static char OKhello[]   = "1000 OK:";
 
 /* Forward referenced functions */
 
Index: src/console/conio.c
===================================================================
--- src/console/conio.c	(revision 7512)
+++ src/console/conio.c	(working copy)
@@ -72,6 +72,11 @@
 #elif HAVE_AIX_OS 
 #include <curses.h>
 #include <term.h>
+#elif defined(__sgi)
+extern "C" int tgetent(char *, char *);
+extern "C" int tgetnum(char id[2]);
+extern "C" char *tgetstr(char id[2], char **);
+extern "C" char *tgoto(char *, int, int);
 #elif defined (__digital__) && defined (__unix__)
 extern "C" int tgetent(void *, const char *);
 extern "C" int tgetnum(const char *);
Index: src/lib/rblist.h
===================================================================
--- src/lib/rblist.h	(revision 7512)
+++ src/lib/rblist.h	(working copy)
@@ -93,16 +93,6 @@
    void destroy(void);
 };
 
-inline rblist::rblist(void *item, rblink *link)
-{
-   init(item, link);
-}
-
-/* Constructor with link at head of item */
-inline rblist::rblist(void): head(0), loffset(0), num_items(0)
-{
-}
-
 /*
  * This allows us to do explicit initialization,
  *   allowing us to mix C++ classes inside malloc'ed
@@ -118,6 +108,16 @@
    num_items = 0;
 }
 
+inline rblist::rblist(void *item, rblink *link)
+{
+   init(item, link);
+}
+
+/* Constructor with link at head of item */
+inline rblist::rblist(void): head(0), loffset(0), num_items(0)
+{
+}
+
 inline void rblist::set_parent(void *item, void *parent)
 {
    ((rblink *)(((char *)item)+loffset))->parent = parent;
Index: src/lib/smartall.h
===================================================================
--- src/lib/smartall.h	(revision 7512)
+++ src/lib/smartall.h	(working copy)
@@ -127,11 +127,14 @@
    free(ptr);
 }
 
+#ifndef __sgi
 void  operator delete(void *ptr, const char *fname, int line)
 {
    (void)fname; (void)line;          /* eliminate compiler complaints */
    free(ptr);
 }
+#endif
+
 void  operator delete[](void *ptr, size_t i, const char *fname, int line)
 {
    (void)i; (void)fname; (void)line; /* eliminate compiler complaints */
Index: src/findlib/attribs.c
===================================================================
--- src/findlib/attribs.c	(revision 7512)
+++ src/findlib/attribs.c	(working copy)
@@ -223,9 +222,12 @@
 #ifdef HAVE_TYPEOF
   #define plug(st, val) st = (typeof st)val
 #else
+  /* FIXME: are you sure about the &, didn't you mean && ? */
   #if !HAVE_GCC & HAVE_SUN_OS
     /* Sun compiler does not handle templates correctly */
     #define plug(st, val) st = val
+  #elif __sgi
+    #define plug(st, val) st = val
   #else
     /* Use templates to do the casting */
     template <class T> void plug(T &st, uint64_t val)
Index: src/bacula.h
===================================================================
--- src/bacula.h	(revision 7512)
+++ src/bacula.h	(working copy)
@@ -58,8 +58,10 @@
 
 /* System includes */
 #if HAVE_STDINT_H
+#ifndef __sgi
 #include <stdint.h>
 #endif
+#endif
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif

Attachment: pgpnIGm8ON5c2.pgp
Description: PGP signature

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bacula-devel mailing list
Bacula-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/bacula-devel


This mailing list archive is a service of Copilotco.