diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-09-03 07:20:50 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-09-03 07:20:50 +0000 |
| commit | c20a8be8432fcc1f5fa5c274987fbb13e2853390 (patch) | |
| tree | a5f65109ee6378309e810655098c22d6e4360c65 /devel/gmake | |
| parent | c0f6e1f4483ca6ea08f21b729de0775ba5a1e545 (diff) | |
| download | ports-c20a8be8432fcc1f5fa5c274987fbb13e2853390.tar.gz ports-c20a8be8432fcc1f5fa5c274987fbb13e2853390.zip | |
Fix a problem with gmake segfaulting with some locales.
PR: 41075
Submitted by: naddy
Notes
Notes:
svn path=/head/; revision=65538
Diffstat (limited to 'devel/gmake')
| -rw-r--r-- | devel/gmake/Makefile | 2 | ||||
| -rw-r--r-- | devel/gmake/files/patch-gettext.c | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 2b2e937140ab..a3880293727c 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmake PORTVERSION= 3.79.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= make diff --git a/devel/gmake/files/patch-gettext.c b/devel/gmake/files/patch-gettext.c index 51c63003effc..fd98d7e3604d 100644 --- a/devel/gmake/files/patch-gettext.c +++ b/devel/gmake/files/patch-gettext.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- gettext.c 2002/06/06 22:10:23 1.1 -+++ gettext.c 2002/06/06 22:11:09 +--- gettext.c.orig Wed Feb 9 08:02:18 2000 ++++ gettext.c Sun Jul 28 04:22:31 2002 @@ -22,6 +22,10 @@ # include <config.h> #endif @@ -14,3 +14,19 @@ $FreeBSD$ #ifdef __GNUC__ # define alloca __builtin_alloca # define HAVE_ALLOCA 1 +@@ -1294,6 +1298,15 @@ + { + FREE_BLOCKS (block_list); + return added; ++ } ++ if (string_space != new_pool) ++ { ++ size_t i; ++ for (i = 0; i < nmap; i++) ++ { ++ map[i].alias += new_pool - string_space; ++ map[i].value += new_pool - string_space; ++ } + } + string_space = new_pool; + string_space_max = new_size; |