diff options
author | dholland <dholland@pkgsrc.org> | 2015-11-07 23:47:52 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2015-11-07 23:47:52 +0000 |
commit | a18e4587c9e536a38bb97ae26b33cce2b5eaa0ec (patch) | |
tree | 95cb5227c4eee21794fa155f5cc51dec2c5568fc | |
parent | cb73ce4f2463e76acafdbeb75066f7f44e3acfb5 (diff) | |
download | pkgsrc-a18e4587c9e536a38bb97ae26b33cce2b5eaa0ec.tar.gz |
Fix openbsd build failure.
-rw-r--r-- | comms/tn3270/distinfo | 4 | ||||
-rw-r--r-- | comms/tn3270/patches/patch-tools_mkmake_mkmake.y | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/comms/tn3270/distinfo b/comms/tn3270/distinfo index 534d73f84b8..0abae375217 100644 --- a/comms/tn3270/distinfo +++ b/comms/tn3270/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2015/11/03 01:34:58 agc Exp $ +$NetBSD: distinfo,v 1.6 2015/11/07 23:47:52 dholland Exp $ SHA1 (tn3270-0.20100116.tar.gz) = b550f2c240aa3b185b935c11ed36e75c8c574503 RMD160 (tn3270-0.20100116.tar.gz) = 59ca2fcaa8f44258eb9cb0069cf17e560754f2c9 SHA512 (tn3270-0.20100116.tar.gz) = 92b89b302b0827b6995c0b04f4642585f93021c5a5e7d30f414ba3fd9314ed019ba35e9a155f0cf7d9c1be7bad37dda44622f9245409a024113358a90005e9b1 Size (tn3270-0.20100116.tar.gz) = 156352 bytes SHA1 (patch-aa) = dfec3563624578dc775f4ec7d0ce813eb9431dce -SHA1 (patch-tools_mkmake_mkmake.y) = e72636ac31a99247b871024665c055db0706b005 +SHA1 (patch-tools_mkmake_mkmake.y) = 8e9dab56b989f1dc3cfc7a17daf6cf95d2dda886 diff --git a/comms/tn3270/patches/patch-tools_mkmake_mkmake.y b/comms/tn3270/patches/patch-tools_mkmake_mkmake.y index 9f9a7febdf9..e86822eee4c 100644 --- a/comms/tn3270/patches/patch-tools_mkmake_mkmake.y +++ b/comms/tn3270/patches/patch-tools_mkmake_mkmake.y @@ -1,6 +1,9 @@ -$NetBSD: patch-tools_mkmake_mkmake.y,v 1.1 2015/01/09 14:28:42 joerg Exp $ +$NetBSD: patch-tools_mkmake_mkmake.y,v 1.2 2015/11/07 23:47:52 dholland Exp $ ---- tools/mkmake/mkmake.y.orig 2015-01-09 12:31:43.000000000 +0000 +- use standard headers +- avoid symbol name collision on OpenBSD where clock() from time.h leaks in + +--- tools/mkmake/mkmake.y.orig 2010-01-17 18:00:07.000000000 +0000 +++ tools/mkmake/mkmake.y @@ -40,6 +40,7 @@ __RCSID("$NetBSD: mkmake.y,v 1.1.1.1 201 #endif @@ -10,3 +13,14 @@ $NetBSD: patch-tools_mkmake_mkmake.y,v 1.1 2015/01/09 14:28:42 joerg Exp $ typedef struct string { int +@@ -308,6 +309,10 @@ white_space : WHITE_SPACE + #include <string.h> + #include <ctype.h> + ++/* work around symbol collision on OpenBSD */ ++#undef clock ++#define clock Clock ++ + /* mkmake.y */ + void yyerror(char *); + void assign(same_t *, same_t *); |