[pkgsrc/trunk]: pkgsrc/devel/check Added a patch to make check compile with c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fce7af60d879
branches:  trunk
changeset: 490468:fce7af60d879
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Mar 11 22:20:49 2005 +0000

description:
Added a patch to make check compile with cpp-2.95.3. Approved by wiz.

diffstat:

 devel/check/distinfo         |   3 ++-
 devel/check/patches/patch-ab |  18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 222cefb369f7 -r fce7af60d879 devel/check/distinfo
--- a/devel/check/distinfo      Fri Mar 11 22:18:27 2005 +0000
+++ b/devel/check/distinfo      Fri Mar 11 22:20:49 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:11 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/11 22:20:49 rillig Exp $
 
 SHA1 (check-0.9.1.tar.gz) = 8fa632d083b6b6fd7ff8cd3bc267d42a92732dcf
 RMD160 (check-0.9.1.tar.gz) = fe2e9d12387da2b35b47f49f836721f1c829940d
 Size (check-0.9.1.tar.gz) = 158743 bytes
 SHA1 (patch-aa) = 959c2a5b72eb722b54b8c486b2a69f8202c0a053
+SHA1 (patch-ab) = 73bf6f1a40138065b2a020b2ebc2d79ecab52322
diff -r 222cefb369f7 -r fce7af60d879 devel/check/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/check/patches/patch-ab      Fri Mar 11 22:20:49 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2005/03/11 22:20:49 rillig Exp $
+
+This patch makes check compile with cpp-2.95.3. The bug which it fixes
+is quite subtile. When fail_if(x) is expanded, the preprocessor deletes
+the last token before the ##. For cpp-2.95, this token starts with the
+"o" of occured. Later versions of cpp just remove the comma.
+
+--- src/check.h.in.orig        Tue Nov  9 14:22:16 2004
++++ src/check.h.in     Fri Mar 11 22:08:46 2005
+@@ -168,7 +168,7 @@ static void __testname (void)\
+ /* Fail the test case if expr is true */
+ #define fail_if(expr, ...)\
+         _fail_unless(!(expr), __FILE__, __LINE__,\
+-        "Failure '"#expr"' occured", ## __VA_ARGS__, NULL)
++        "Failure '"#expr"' occured" , ## __VA_ARGS__, NULL)
+ 
+ /* Always fail */
+ #define fail(...) _fail_unless(0, __FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL)