diff options
| author | markd <markd> | 2015-12-13 10:46:26 +0000 |
|---|---|---|
| committer | markd <markd> | 2015-12-13 10:46:26 +0000 |
| commit | 7cf475fb5c2c4ebefa71707fc4744782c292a438 (patch) | |
| tree | 414ee91026acb68695ac276047e45e24aa5de54d /shells | |
| parent | bc09dba7113df4ea1c14ecfa3b4379878e99bedf (diff) | |
| download | pkgsrc-7cf475fb5c2c4ebefa71707fc4744782c292a438.tar.gz | |
Upstream patch to fix gcc5 optimization issue.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/tcsh/Makefile | 4 | ||||
| -rw-r--r-- | shells/tcsh/distinfo | 3 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-tc.alloc.c | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index a657d591998..ba2a0c16849 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2015/09/09 22:04:55 kim Exp $ +# $NetBSD: Makefile,v 1.81 2015/12/13 10:46:26 markd Exp $ DISTNAME= tcsh-6.19.00 -#PKGREVISION= 0 +PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \ ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/ diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index 2ee294d687a..a413c6668e5 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2015/11/02 23:00:35 agc Exp $ +$NetBSD: distinfo,v 1.36 2015/12/13 10:46:26 markd Exp $ SHA1 (tcsh-6.19.00.tar.gz) = cdb1abe319fab5d3caff101c393293e5b3607f0c RMD160 (tcsh-6.19.00.tar.gz) = 0f1e8c5fdee634baff6670290bd30074db965da3 @@ -8,3 +8,4 @@ SHA1 (patch-aa) = cedcb5e0b209c50a945db6778fd86574ad16ad6b SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2 SHA1 (patch-configure) = 91c2019da8c074bd6f24b84bf798ccd497110727 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e +SHA1 (patch-tc.alloc.c) = 826edfd3c8d5bb4a9c5515b69ba28a4ad0eff99e diff --git a/shells/tcsh/patches/patch-tc.alloc.c b/shells/tcsh/patches/patch-tc.alloc.c new file mode 100644 index 00000000000..c3e54edfd79 --- /dev/null +++ b/shells/tcsh/patches/patch-tc.alloc.c @@ -0,0 +1,21 @@ +$NetBSD: patch-tc.alloc.c,v 1.1 2015/12/13 10:46:26 markd Exp $ + +Fix gcc5 optimization issue - from upstream. + +--- tc.alloc.c.orig 2015-02-22 16:31:54.000000000 +0000 ++++ tc.alloc.c +@@ -348,10 +348,13 @@ calloc(size_t i, size_t j) + { + #ifndef lint + char *cp; ++ volatile size_t k; + + i *= j; + cp = xmalloc(i); +- memset(cp, 0, i); ++ /* Stop gcc 5.x from optimizing malloc+memset = calloc */ ++ k = i; ++ memset(cp, 0, k); + + return ((memalign_t) cp); + #else |