Added some patches to make Cqual build on IRIX 6.5/mips with MIPSpro. (By

the way, all these patches have already been reported upstream and are
mostly fixed.)

4 files changed, 91 insertions, 1 deletions

diff --git a/devel/cqual/distinfo b/devel/cqual/distinfo
index 24fb4716b5e..a928b6a7d4c 100644
--- a/devel/cqual/distinfo
+++ b/devel/cqual/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/01/18 23:24:12 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/01/19 04:21:39 rillig Exp $
 
 SHA1 (cqual-0.991.tar.gz) = f559af6947465ca242f19c1f499c7cb004e713e4
 RMD160 (cqual-0.991.tar.gz) = e3837a11c75f750196ec4be7f991ec519c1260f6
@@ -19,3 +19,6 @@ SHA1 (patch-bj) = 66c4c93fe18841db68ccdc2bb8e4d22a06abd731
 SHA1 (patch-bk) = 58edca8937cd587911d58bebc5d6bbbea87ca028
 SHA1 (patch-bl) = 70fe692644529a38bdaefbff67a264db9179e5f7
 SHA1 (patch-bm) = eb57badc6c4530243aeeeb14aba4418d77ea453c
+SHA1 (patch-ca) = fb4806cfb3c2347fe5089f42e419c57bec7e2432
+SHA1 (patch-cb) = 568df77eefeea982d9a7faa638c6be12a54fa284
+SHA1 (patch-cc) = f30adeec491d999b63e1ad5abd2b34c287608e5e
diff --git a/devel/cqual/patches/patch-ca b/devel/cqual/patches/patch-ca
new file mode 100644
index 00000000000..520008c69a2
--- /dev/null
+++ b/devel/cqual/patches/patch-ca
@@ -0,0 +1,20 @@
+$NetBSD: patch-ca,v 1.1 2006/01/19 04:21:39 rillig Exp $
+
+Made the handling of the variadic macro arguments conforming to ISO C99.
+
+--- src/cqual.h.orig	2003-09-10 20:52:04.000000000 +0200
++++ src/cqual.h	2006-01-19 04:28:23.000000000 +0100
+@@ -60,11 +60,11 @@ void load_config_file_quals(const char *
+ 
+ /* If you use fail_loc, you must give a 3rd argument!  Pass 0 if you
+    don't need anything there. */
+-#define fail_loc(l, s, args...) fail("(at %s:%ld) " s, ((l)->filename), ((l)->lineno), args)
++#define fail_loc(l, s, ...) fail("(at %s:%ld) " s, ((l)->filename), ((l)->lineno), __VA_ARGS__)
+ 
+ /* If you use user_error_loc, you must give a 3rd argument!  Pass 0 if you
+    don't need anything there. */
+-#define user_error_loc(l, s, args...) user_error("(at %s:%ld) " s, ((l)->filename), ((l)->lineno), args)
++#define user_error_loc(l, s, ...) user_error("(at %s:%ld) " s, ((l)->filename), ((l)->lineno), __VA_ARGS__)
+ 
+ EXTERN_C_END
+ 
diff --git a/devel/cqual/patches/patch-cb b/devel/cqual/patches/patch-cb
new file mode 100644
index 00000000000..614b3694558
--- /dev/null
+++ b/devel/cqual/patches/patch-cb
@@ -0,0 +1,24 @@
+$NetBSD: patch-cb,v 1.1 2006/01/19 04:21:39 rillig Exp $
+
+Made the handling of the variadic macro arguments conforming to ISO C99.
+
+--- src/utils.h.orig	2003-09-10 20:52:09.000000000 +0200
++++ src/utils.h	2006-01-19 04:26:14.000000000 +0100
+@@ -44,7 +44,7 @@ unsigned long lcm(unsigned long x, unsig
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+ 
+ #ifdef HAVE_VARIADIC_MACROS
+-#define fail(args...) __fail(__FILE__, __LINE__, __FUNCTION__, args)
++#define fail(...) __fail(__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+ #else
+ void fail(const char *fmt, ...);
+ #endif
+@@ -53,7 +53,7 @@ void __fail(const char *file, unsigned i
+ 	    const char *func, const char *fmt, ...) __attribute__ ((__noreturn__));
+ 
+ #ifdef HAVE_VARIADIC_MACROS
+-#define user_error(args...) __user_error(__FILE__, __LINE__, __FUNCTION__, args)
++#define user_error(...) __user_error(__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+ #else
+ void user_error(const char *fmt, ...);
+ #endif
diff --git a/devel/cqual/patches/patch-cc b/devel/cqual/patches/patch-cc
new file mode 100644
index 00000000000..d60c04526a7
--- /dev/null
+++ b/devel/cqual/patches/patch-cc
@@ -0,0 +1,43 @@
+$NetBSD: patch-cc,v 1.1 2006/01/19 04:21:39 rillig Exp $
+
+--- src/libcompat/regions.c.orig	Wed Jan 18 21:53:04 2006
++++ src/libcompat/regions.c	Wed Jan 18 22:11:39 2006
+@@ -211,7 +211,7 @@
+   return r;
+ }
+ 
+-inline char *__rc_rstralloc(region r, size_t size)
++char *__rc_rstralloc(region r, size_t size)
+ {
+   void *mem, *dummy;
+ 
+@@ -222,7 +222,7 @@
+   return mem;
+ }
+ 
+-inline char *__rc_rstralloc0(region r, size_t size)
++char *__rc_rstralloc0(region r, size_t size)
+ {
+   char *mem;
+ 
+@@ -276,19 +276,17 @@
+   return newmem;
+ }
+ 
+-inline
+ char *__rc_rstrextend(region r, const char *old, size_t newsize)
+ {
+   return internal_rstrextend(r, old, newsize, 0);
+ }
+ 
+-inline
+ char *__rc_rstrextend0(region r, const char *old, size_t newsize)
+ {
+   return internal_rstrextend(r, old, newsize, 1);
+ }
+ 
+-inline void *__rc_typed_ralloc(region r, size_t size, type_t t)
++void *__rc_typed_ralloc(region r, size_t size, type_t t)
+ {
+   return __rc_rstralloc0(r, size);
+ }