From 86f7f090d3e3236083d5594cbd2face3ba7d4bd1 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Wed, 23 Aug 2000 17:54:13 +0000 Subject: add patch so this builds on sparc. Thanks to Robert Elz and Alistair Crooks for help on this. --- devel/libstash/files/patch-sum | 3 +- devel/libstash/patches/patch-ab | 96 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 devel/libstash/patches/patch-ab diff --git a/devel/libstash/files/patch-sum b/devel/libstash/files/patch-sum index 4c63ca7ae7c..1b15c9a0371 100644 --- a/devel/libstash/files/patch-sum +++ b/devel/libstash/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/03/30 14:10:44 rh Exp $ +$NetBSD: patch-sum,v 1.2 2000/08/23 17:54:13 dmcmahill Exp $ MD5 (patch-aa) = 06d46d071c70e1b821b16614d066b614 +MD5 (patch-ab) = 7d7ea3b65267a28abfb3f8a610929a04 diff --git a/devel/libstash/patches/patch-ab b/devel/libstash/patches/patch-ab new file mode 100644 index 00000000000..392166307d8 --- /dev/null +++ b/devel/libstash/patches/patch-ab @@ -0,0 +1,96 @@ +$NetBSD: patch-ab,v 1.1 2000/08/23 17:54:14 dmcmahill Exp $ + +needed to build on sparc which implements the va_arg macro differently than +other ports. + +--- src/out.c.orig ++++ src/out.c +@@ -1054,4 +1054,13 @@ + const char * a_format, va_list a_p) + { ++ cw_uint32_t cw32; ++ cw_uint64_t cw64; ++#ifdef _TYPE_FP96_DEFINED ++ cw_fp96_t cw96; ++#endif ++#ifdef _TYPE_FP128_DEFINED ++ cw_fp128_t cw128; ++#endif ++ + cw_sint32_t retval, size, format_len, i, j, enti; + cw_uint32_t metric; +@@ -1125,10 +1134,12 @@ + case 4: + { +- arg = (void *) &va_arg(a_p, cw_uint32_t); ++ cw32 = va_arg(a_p, cw_uint32_t); ++ arg = &cw32; + break; + } + case 8: + { +- arg = (void *) &va_arg(a_p, cw_uint64_t); ++ cw64 = va_arg(a_p, cw_uint64_t); ++ arg = &cw64; + break; + } +@@ -1136,5 +1147,6 @@ + case 12: + { +- arg = (void *) &va_arg(a_p, cw_fp96_t); ++ cw96 = va_arg(a_p, cw_fp96_t); ++ arg = &cw96; + break; + } +@@ -1143,5 +1155,6 @@ + case 16: + { +- arg = (void *) &va_arg(a_p, cw_fp128_t); ++ cw128 = va_arg(a_p, cw_fp128_t); ++ arg = &cw128; + break; + } +@@ -1232,4 +1245,12 @@ + va_list a_p) + { ++ cw_uint32_t cw32; ++ cw_uint64_t cw64; ++#ifdef _TYPE_FP96_DEFINED ++ cw_fp96_t cw96; ++#endif ++#ifdef _TYPE_FP128_DEFINED ++ cw_fp128_t cw128; ++#endif + cw_sint32_t retval, spec_metric; + cw_uint32_t i, metric; /* Total number of bytes to be printed. */ +@@ -1369,10 +1390,12 @@ + case 4: + { +- arg = (void *) &va_arg(a_p, cw_uint32_t); ++ cw32 = va_arg(a_p, cw_uint32_t); ++ arg = &cw32; + break; + } + case 8: + { +- arg = (void *) &va_arg(a_p, cw_uint64_t); ++ cw64 = va_arg(a_p, cw_uint64_t); ++ arg = &cw64; + break; + } +@@ -1380,5 +1403,6 @@ + case 12: + { +- arg = (void *) &va_arg(a_p, cw_fp96_t); ++ cw96 = va_arg(a_p, cw_fp96_t); ++ arg = &cw96; + break; + } +@@ -1387,5 +1411,6 @@ + case 16: + { +- arg = (void *) &va_arg(a_p, cw_fp128_t); ++ cw128 = va_arg(a_p, cw_fp128_t); ++ arg = &cw128; + break; + } -- cgit v1.2.3