[pkgsrc/trunk]: pkgsrc/devel/cqual Added the patches that are required to bui...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eac02764ac29
branches:  trunk
changeset: 506553:eac02764ac29
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jan 18 23:24:12 2006 +0000

description:
Added the patches that are required to build CQual on SunOS 5.8/sparc
with SunPro.

diffstat:

 devel/cqual/Makefile         |   9 +++++-
 devel/cqual/distinfo         |  17 ++++++++++-
 devel/cqual/patches/patch-ac |   8 ++--
 devel/cqual/patches/patch-ba |  15 ++++++++++
 devel/cqual/patches/patch-bb |  66 ++++++++++++++++++++++++++++++++++++++++++++
 devel/cqual/patches/patch-bc |  39 ++++++++++++++++++++++++++
 devel/cqual/patches/patch-bd |  36 ++++++++++++++++++++++++
 devel/cqual/patches/patch-be |  45 ++++++++++++++++++++++++++++++
 devel/cqual/patches/patch-bf |  14 +++++++++
 devel/cqual/patches/patch-bg |  18 ++++++++++++
 devel/cqual/patches/patch-bh |  30 ++++++++++++++++++++
 devel/cqual/patches/patch-bi |  32 +++++++++++++++++++++
 devel/cqual/patches/patch-bj |  15 ++++++++++
 devel/cqual/patches/patch-bk |  37 ++++++++++++++++++++++++
 devel/cqual/patches/patch-bl |  30 ++++++++++++++++++++
 devel/cqual/patches/patch-bm |  41 +++++++++++++++++++++++++++
 16 files changed, 445 insertions(+), 7 deletions(-)

diffs (truncated from 542 to 300 lines):

diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/Makefile
--- a/devel/cqual/Makefile      Wed Jan 18 22:54:52 2006 +0000
+++ b/devel/cqual/Makefile      Wed Jan 18 23:24:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/01/15 21:55:14 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/18 23:24:12 rillig Exp $
 #
 
 DISTNAME=              cqual-0.991
@@ -18,6 +18,13 @@
 
 INSTALLATION_DIRS=     share/doc/cqual share/examples/cqual
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.8"
+pre-build:
+       ${ECHO} "/* empty dummy header */" > ${BUILDLINK_DIR:Q}/include/stdint.h
+.endif
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC:Q}/doc/user-guide.pdf ${PREFIX:Q}/share/doc/cqual/
        ${INSTALL_DATA} ${WRKSRC:Q}/examples/* ${PREFIX:Q}/share/examples/cqual/
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/distinfo
--- a/devel/cqual/distinfo      Wed Jan 18 22:54:52 2006 +0000
+++ b/devel/cqual/distinfo      Wed Jan 18 23:24:12 2006 +0000
@@ -1,8 +1,21 @@
-$NetBSD: distinfo,v 1.2 2006/01/13 07:51:42 rillig Exp $
+$NetBSD: distinfo,v 1.3 2006/01/18 23:24:12 rillig Exp $
 
 SHA1 (cqual-0.991.tar.gz) = f559af6947465ca242f19c1f499c7cb004e713e4
 RMD160 (cqual-0.991.tar.gz) = e3837a11c75f750196ec4be7f991ec519c1260f6
 Size (cqual-0.991.tar.gz) = 1197696 bytes
 SHA1 (patch-aa) = bf21f9d9213beb54847a79fdf1213c7378ac062d
 SHA1 (patch-ab) = 5ededa6979542cb83c53abd38fe9923495562a99
-SHA1 (patch-ac) = d8865d91707d76f2ce3acedf992cec6821c54344
+SHA1 (patch-ac) = 0aee16d388ff2d40ca176c0f313505d83ee3aa52
+SHA1 (patch-ba) = 316aae97a0031bbe229baaa0519ad25a2b901663
+SHA1 (patch-bb) = 517c9d0a151e6d501c3ea49b0d612e75a09fc1db
+SHA1 (patch-bc) = 5b37902e672fe28156908a98df69e0630e9c9738
+SHA1 (patch-bd) = 1d434fac7ca549e2b0e0e12d191c5846e66bedf5
+SHA1 (patch-be) = 0a1a9bd41f57805da84922538fe2c42d84fd33f0
+SHA1 (patch-bf) = 2192b53278568ca783687d025ecca85569185f42
+SHA1 (patch-bg) = 4b53d4caac2c24a98e8acbc054877256c6ddebac
+SHA1 (patch-bh) = b4e05070ced650b4dea42620e2ebb78eabf743ee
+SHA1 (patch-bi) = d6786e93d2f77c56f2de3cdb8d29cb34dc43916b
+SHA1 (patch-bj) = 66c4c93fe18841db68ccdc2bb8e4d22a06abd731
+SHA1 (patch-bk) = 58edca8937cd587911d58bebc5d6bbbea87ca028
+SHA1 (patch-bl) = 70fe692644529a38bdaefbff67a264db9179e5f7
+SHA1 (patch-bm) = eb57badc6c4530243aeeeb14aba4418d77ea453c
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-ac
--- a/devel/cqual/patches/patch-ac      Wed Jan 18 22:54:52 2006 +0000
+++ b/devel/cqual/patches/patch-ac      Wed Jan 18 23:24:12 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2006/01/13 07:51:42 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2006/01/18 23:24:12 rillig Exp $
 
 From the maintainers via private mail. It fixes the special handling of
 malloc(), which had been confusing to me. Fixed in CVS.
@@ -8,9 +8,9 @@
 RCS file: /cvsroot/cqual/cqual/src/analyze.c,v
 retrieving revision 1.373
 diff -u -r1.373 analyze.c
---- src/analyze.c      12 Sep 2005 14:55:48 -0000      1.373
-+++ src/analyze.c      13 Jan 2006 05:36:38 -0000
-@@ -2342,13 +2342,16 @@
+--- src/analyze.c.orig 2003-12-12 16:06:30.000000000 +0100
++++ src/analyze.c      2006-01-16 14:57:37.428011800 +0100
+@@ -2273,13 +2273,16 @@ static einfo analyze_expression(expressi
        fqt = points_to_qtype(f_info.qt);
        args = arg_qtypes(fqt);
  
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-ba      Wed Jan 18 23:24:12 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.1 2006/01/18 23:24:12 rillig Exp $
+
+SunPro says: void functions cannot return a value.
+
+--- src/array.h.orig   2001-08-16 00:46:35.000000000 +0200
++++ src/array.h        2006-01-16 14:13:15.764481600 +0100
+@@ -50,7 +50,7 @@ type *name ## _extend(name a, int by) \
+ } \
+ void name ## _reset(name a) \
+ { \
+-  return array_reset((struct array *)a); \
++  array_reset((struct array *)a); \
+ } \
+ size_t name ## _length(name a) \
+ { \
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-bb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-bb      Wed Jan 18 23:24:12 2006 +0000
@@ -0,0 +1,66 @@
+$NetBSD: patch-bb,v 1.1 2006/01/18 23:24:12 rillig Exp $
+
+SunPro says: void functions cannot return a value.
+
+--- src/common-analyze.c.orig  2003-09-27 23:35:48.000000000 +0200
++++ src/common-analyze.c       2006-01-16 14:41:27.006921000 +0100
+@@ -36,11 +36,11 @@ effect global_effect = NULL; /* Effect c
+                                      of every function */
+ effect global_env = NULL;    /* Locations bound in global scope */
+ 
+-inline void mk_effect_leq_global_env(effect e) 
++void mk_effect_leq_global_env(effect e) 
+ { 
+   mkleq_effect(e, global_env); 
+ }
+-inline void mk_effect_leq_global_effect(effect e) 
++void mk_effect_leq_global_effect(effect e) 
+ { 
+   mkleq_effect(e, global_effect); 
+ }
+@@ -492,21 +492,30 @@ void mkNonConst_aggregate(location loc, 
+  *                                                                        *
+  **************************************************************************/
+ 
+-inline einfo mkeinfo(qtype qt, effect eff, bool ismalloc)
++einfo mkeinfo(qtype qt, effect eff, bool ismalloc)
+ {
+-  struct einfo result = {qt: qt, eff: eff, ismalloc: ismalloc};
++  struct einfo result;
++
++  result.qt = qt;
++  result.eff = eff;
++  result.ismalloc = ismalloc;
+   return result;
+ }
+ 
+-inline sinfo mksinfo(effect eff)
++sinfo mksinfo(effect eff)
+ {
+-  struct sinfo result = {eff: eff};
++  struct sinfo result;
++
++  result.eff = eff;
+   return result;
+ }
+ 
+-inline dinfo mkdinfo(effect eff, effect alocs)
++dinfo mkdinfo(effect eff, effect alocs)
+ {
+-  struct dinfo result = {eff: eff, alocs: alocs};
++  struct dinfo result;
++
++  result.eff = eff;
++  result.alocs = alocs;
+   return result;
+ }
+ 
+@@ -550,7 +559,7 @@ struct operator operators[] =
+     {0, 0, NULL}};
+ 
+ /* Given an operator function name, return its signature */
+-inline operator find_op_name(const char *name)
++operator find_op_name(const char *name)
+ {
+   int i;
+ 
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-bc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-bc      Wed Jan 18 23:24:12 2006 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-bc,v 1.1 2006/01/18 23:24:12 rillig Exp $
+
+SunPro cannot handle extern inline functions.
+
+--- src/common-analyze.h.orig  2003-09-10 20:52:03.000000000 +0200
++++ src/common-analyze.h       2006-01-16 14:40:59.088069200 +0100
+@@ -73,7 +73,7 @@ extern struct operator operators[];
+ 
+ #define exists_op_kind(k) (find_op_kind(k) != NULL)
+ 
+-inline operator find_op_name(const char *name);
++operator find_op_name(const char *name);
+ void reset_operators(void);
+ bool match_signature(enum sig_kind k, qtype qt, location loc);
+ bool add_op_signature(operator op, qtype qt, location loc);
+@@ -95,8 +95,8 @@ qtype do_dereference(location loc, qtype
+ einfo put_id_in_context(location, einfo, context);
+ void init_string(location, qtype lhs_qtype, qtype rhs_qtype, const char *error_message);
+ 
+-inline void mk_effect_leq_global_env(effect e);
+-inline void mk_effect_leq_global_effect(effect e);
++void mk_effect_leq_global_env(effect e);
++void mk_effect_leq_global_effect(effect e);
+ 
+ extern void qtype_mklhs_nonconst(location, qtype);
+ extern void mkNonConst_qual(location, qual, const char *error_message);
+@@ -104,9 +104,9 @@ extern void mkNonConst_pointer(location,
+ extern void mkNonConst_aggregate(location, qtype, const char *error_message);
+ extern void mkConst_pointer(location, qtype, const char *error_message);
+ 
+-inline einfo mkeinfo(qtype qt, effect eff, bool ismalloc);
+-inline sinfo mksinfo(effect eff);
+-inline dinfo mkdinfo(effect eff, effect alocs);
++einfo mkeinfo(qtype qt, effect eff, bool ismalloc);
++sinfo mksinfo(effect eff);
++dinfo mkdinfo(effect eff, effect alocs);
+ 
+ bool file_pointer_qtype(qtype qt);
+ 
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-bd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-bd      Wed Jan 18 23:24:12 2006 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-bd,v 1.1 2006/01/18 23:24:12 rillig Exp $
+
+SunPro says: void functions cannot return a value.
+
+--- src/confine_inf.c.orig     2002-12-30 22:43:53.000000000 +0100
++++ src/confine_inf.c  2006-01-16 14:35:36.739367700 +0100
+@@ -183,7 +183,8 @@ static void confine_inf_declaration(decl
+     case kind_extension_decl:
+       {
+       extension_decl ed = CAST(extension_decl, d);
+-      return confine_inf_declaration(ed->decl, cs); 
++      confine_inf_declaration(ed->decl, cs);
++      return;
+       /* Ignore __extension__ */
+       };
+     default:
+@@ -642,14 +643,16 @@ static void confine_inf_unary_expression
+       {
+       assert(context == rpos);
+       if (type_function(e->arg1->type))
+-        return confine_inf_expression(e->arg1, context);
++        confine_inf_expression(e->arg1, context);
+       else
+-        return confine_inf_expression(e->arg1, apos);
++        confine_inf_expression(e->arg1, apos);
++      return;
+       }
+       break;
+     case kind_extension_expr:
+       {
+-      return confine_inf_expression(e->arg1, context);
++      confine_inf_expression(e->arg1, context);
++      return;
+       }
+       break;
+     case kind_sizeof_expr:
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-be
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-be      Wed Jan 18 23:24:12 2006 +0000
@@ -0,0 +1,45 @@
+$NetBSD: patch-be,v 1.1 2006/01/18 23:24:12 rillig Exp $
+
+SunPro cannot handle this style of direct initialization.
+
+--- src/flow.c.orig    2003-09-10 20:52:05.000000000 +0200
++++ src/flow.c 2006-01-16 14:37:58.365503000 +0100
+@@ -218,11 +218,13 @@ void finish_flow_sensitive(void)
+ static inline einfo mkeinfo(qtype qt, store out, store true_out,
+                           store false_out, bool ismalloc)
+ {
+-  struct einfo result = {qt: qt,
+-                       out: out,
+-                       true_out: true_out,
+-                       false_out: false_out,
+-                         ismalloc: ismalloc};
++  struct einfo result;
++
++  result.qt = qt;
++  result.out = out;
++  result.true_out = true_out;
++  result.false_out = false_out;
++  result.ismalloc = ismalloc;
+   return result;
+ }
+ 
+@@ -250,13 +252,17 @@ static inline store false_out_einfo(einf
+ 
+ static inline sinfo mksinfo(store out)
+ {
+-  struct sinfo result = {out: out};
++  struct sinfo result;
++
++  result.out = out;
+   return result;
+ }
+ 
+ static inline dinfo mkdinfo(store out)
+ {
+-  struct dinfo result = {out: out};
++  struct dinfo result;
++
++  result.out = out;
+   return result;
+ }
+ 
diff -r a6f3edaa91cd -r eac02764ac29 devel/cqual/patches/patch-bf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-bf      Wed Jan 18 23:24:12 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-bf,v 1.1 2006/01/18 23:24:12 rillig Exp $
+
+Solaris does not have <stdint.h>, and the code does not seem to need it.