diff options
| author | mrg <mrg@pkgsrc.org> | 2020-07-08 04:06:48 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2020-07-08 04:06:48 +0000 |
| commit | b6fc56aa6b52b74fcf0fb194ea93a6bd1dad8661 (patch) | |
| tree | 1a91c1c9657cfbe4bd4015366be27b8b1ba6f2fa | |
| parent | 7d1077ede2a284758fbb6e0c6c9784cb09fa2c69 (diff) | |
| download | pkgsrc-b6fc56aa6b52b74fcf0fb194ea93a6bd1dad8661.tar.gz | |
define SYSMALLOC on netbsd. fixes standalone-tcsh link, which pulled
in libc malloc as well as tcsh malloc, and failed.
ok christos@
| -rw-r--r-- | shells/tcsh/distinfo | 4 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-ab | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index 99d6fab5f03..9168ad55aae 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.44 2019/12/08 22:08:55 leot Exp $ +$NetBSD: distinfo,v 1.45 2020/07/08 04:06:48 mrg Exp $ SHA1 (tcsh-6.22.02.tar.gz) = d3c916c82eec7e20c49dedf660edd51a7971f8ab RMD160 (tcsh-6.22.02.tar.gz) = f6c7d6521e1e092dd2c68727e45fbadd54af82e4 SHA512 (tcsh-6.22.02.tar.gz) = 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980 Size (tcsh-6.22.02.tar.gz) = 1006405 bytes SHA1 (patch-aa) = 6ec2bcee6029e733743a73d267aa51bfcc898843 -SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2 +SHA1 (patch-ab) = 715d939e8a8f4917bd219dccd91d5c49ae502939 SHA1 (patch-configure) = 6970c041a66910325d1fb53ebf8ab3627d764778 SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab index 10e13acfe5c..5db310c8455 100644 --- a/shells/tcsh/patches/patch-ab +++ b/shells/tcsh/patches/patch-ab @@ -1,10 +1,11 @@ -$NetBSD: patch-ab,v 1.12 2012/05/25 20:01:31 he Exp $ +$NetBSD: patch-ab,v 1.13 2020/07/08 04:06:48 mrg Exp $ Special adaptation for different NetBSD versions and for OpenBSD. +Turn on SYSMALLOC for NetBSD until tc.alloc.c gets better. ---- config_f.h.orig 2006-08-28 10:53:04.000000000 -0400 -+++ config_f.h 2007-04-09 20:02:34.000000000 -0400 -@@ -44,7 +44,18 @@ +--- config_f.h.orig 2019-12-04 09:51:54.000000000 -0800 ++++ config_f.h 2020-07-06 15:21:46.122410962 -0700 +@@ -47,7 +47,18 @@ * of nls... * */ @@ -24,3 +25,12 @@ Special adaptation for different NetBSD versions and for OpenBSD. /* * WIDE_STRINGS Represent strings using wide characters +@@ -138,7 +149,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) + # define SYSMALLOC + #else + # undef SYSMALLOC |