diff options
| author | asau <asau@pkgsrc.org> | 2014-06-26 22:46:56 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2014-06-26 22:46:56 +0000 |
| commit | cfcd9baffe8b84d7e57fd25fa2d68d40dbc50f1d (patch) | |
| tree | 094c9b001d4b17513e935140989aae922bddef21 /devel | |
| parent | bae4c90ac6ae5d091c5543a3ddf030ae41223c0b (diff) | |
| download | pkgsrc-cfcd9baffe8b84d7e57fd25fa2d68d40dbc50f1d.tar.gz | |
Don't build bundled implementation of "mktime" on NetBSD.
This makes the package build on 32-bit NetBSD.
Patch is taken from devel/blame that carries the same "mktime" implementation.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/scmcvs/distinfo | 3 | ||||
| -rw-r--r-- | devel/scmcvs/patches/patch-lib_mktime.c | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo index 563e74e0973..c972a9ee29b 100644 --- a/devel/scmcvs/distinfo +++ b/devel/scmcvs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2013/10/14 06:51:02 adam Exp $ +$NetBSD: distinfo,v 1.10 2014/06/26 22:46:56 asau Exp $ SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9 RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487 @@ -24,5 +24,6 @@ SHA1 (patch-av) = 5cff0af09fd16509758aed06b5d9ce1b3985b1a9 SHA1 (patch-ay) = 6ce1c3c21dbc478248068f8b8850c21b0cb48c42 SHA1 (patch-az) = 9dfd460ae6617f1492e0e6861387ff80080a7d5d SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07 +SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920 SHA1 (patch-src_ignore.c) = 90ac25311c83bb5713b83b9cfb6b2c03790ee787 SHA1 (patch-src_zlib.c) = fee3becf1cc2e45d1241a302ed65c5f11b477a0a diff --git a/devel/scmcvs/patches/patch-lib_mktime.c b/devel/scmcvs/patches/patch-lib_mktime.c new file mode 100644 index 00000000000..87c0630f78c --- /dev/null +++ b/devel/scmcvs/patches/patch-lib_mktime.c @@ -0,0 +1,28 @@ +$NetBSD: patch-lib_mktime.c,v 1.1 2014/06/26 22:46:57 asau Exp $ + +This code is broken and uncompilable on 32-bit NetBSD. +The problem is the same as reported here: + http://sourceware.org/bugzilla/show_bug.cgi?id=12401 + +The path of least resistance is just to skip the entire file on +NetBSD, as there is a perfectly good mktime() in libc. + +--- lib/mktime.c.orig 2005-09-19 16:16:56.000000000 +0000 ++++ lib/mktime.c +@@ -21,6 +21,8 @@ + mktime. */ + /* #define DEBUG 1 */ + ++#ifndef __NetBSD__ ++ + #ifdef HAVE_CONFIG_H + # include <config.h> + #endif +@@ -656,6 +658,7 @@ main (int argc, char **argv) + } + + #endif /* DEBUG */ ++#endif /* __NetBSD__ */ + + /* + Local Variables: |