Fixed an internal cqual error. Improved the gcqual program. Added a

debugging option. Bumped PKGREVISION.

2 files changed, 52 insertions, 4 deletions

diff --git a/devel/cqual/patches/patch-aa b/devel/cqual/patches/patch-aa
index 4f9805332b5..25bb88bd6d5 100644
--- a/devel/cqual/patches/patch-aa
+++ b/devel/cqual/patches/patch-aa
@@ -1,9 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2006/03/02 19:56:24 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/17 22:16:55 rillig Exp $
 
 Removed C++-style comments.
 
---- src/qtype.c.orig	2003-10-06 21:28:57.000000000 +0000
-+++ src/qtype.c
+Added the case of primitive types, since it had crashed when parsing the
+definition of fdopen().
+
+--- src/qtype.c.orig	2003-10-06 23:28:57.000000000 +0200
++++ src/qtype.c	2006-07-18 00:14:23.000000000 +0200
 @@ -774,7 +774,7 @@ static void mktoplev_struct_cons_qtype(l
    }
    else if (exists_fieldflow_qual && fqt && (qtype_struct(qt) || qtype_union(qt))) {
@@ -22,7 +25,16 @@ Removed C++-style comments.
    qtype result;
  
    fname = field_decl_name(fdecl) ? field_decl_name(fdecl) : "(anonymous)";
-@@ -3352,8 +3352,6 @@ static bool mkXeq_qtype(location loc, qu
+@@ -2663,6 +2663,8 @@ aloc aloc_qtype(qtype qt)
+   qt = ecr_qtype(qt);
+   switch (qt->type->kind)
+     {
++    case tk_primitive:
++      return qt->type->u.prim.aloc;
+     case tk_pointer:
+       return qt->type->u.ptr.aloc;
+     case tk_pointer_loc:
+@@ -3352,8 +3354,6 @@ static bool mkXeq_qtype(location loc, qu
  	      new_link = t1;
  	    }
  	      
diff --git a/devel/cqual/patches/patch-ce b/devel/cqual/patches/patch-ce
new file mode 100644
index 00000000000..f88b34fb398
--- /dev/null
+++ b/devel/cqual/patches/patch-ce
@@ -0,0 +1,36 @@
+$NetBSD: patch-ce,v 1.1 2006/07/17 22:16:55 rillig Exp $
+
+- Use @CC@ instead of gcc for the compiler.
+- Prefer the installed cqual over the one in $PATH.
+- Error messages belong on stderr, not stdout.
+
+--- bin/gcqual.in.orig	2006-07-17 08:55:02.000000000 +0200
++++ bin/gcqual.in	2006-07-17 08:57:26.000000000 +0200
+@@ -22,10 +22,10 @@ use File::Basename;
+ 
+ 
+ # Global config options -- should probably do something smarter with $CC
+-$CC="gcc";
+-$cqual="cqual";
+-$pkgdatadir = "@prefix@/share/@PACKAGE@"; # Yuck. Is there a better way?
+-$scriptname = $0;
++my $CC = "@CC@";
++my $cqual = (-f "@prefix@/bin/cqual" ? "@prefix@/bin/cqual" : "cqual");
++my $pkgdatadir = "@prefix@/share/@PACKAGE@"; # Yuck. Is there a better way?
++my $scriptname = $0;
+ 
+ sub usage
+ {
+@@ -237,10 +237,10 @@ if ($#ifiles >= 0) {
+     }
+     print ("@cmd\n") if ($debug);
+     system(@cmd) == 0 
+-	or die "cqual failed: $?";
++	or die "cqual failed with exitcode " . ($?>>8) . ": $!";
+ }
+ else
+ {
+-    print ("Could not parse command line args.  No .c or .i files specified?\n");
++    print STDERR ("Could not parse command line args.  No .c or .i files specified?\n");
+     usage();
+ }