diff options
| author | rillig <rillig@pkgsrc.org> | 2005-03-11 22:20:49 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-03-11 22:20:49 +0000 |
| commit | bfd186586d65eb281dd94ee31694c24b58c2a889 (patch) | |
| tree | 33f47311fbed4f1ec6f7b7632bc9c1910ac192c4 /devel | |
| parent | cdda78045927c7aa2c2d9566074bed8afc1d6193 (diff) | |
| download | pkgsrc-bfd186586d65eb281dd94ee31694c24b58c2a889.tar.gz | |
Added a patch to make check compile with cpp-2.95.3. Approved by wiz.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/check/distinfo | 3 | ||||
| -rw-r--r-- | devel/check/patches/patch-ab | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/devel/check/distinfo b/devel/check/distinfo index 740f72e62ce..40da6cbae6f 100644 --- a/devel/check/distinfo +++ b/devel/check/distinfo @@ -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 --git a/devel/check/patches/patch-ab b/devel/check/patches/patch-ab new file mode 100644 index 00000000000..d1a038b2b41 --- /dev/null +++ b/devel/check/patches/patch-ab @@ -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) |