diff options
| author | wiz <wiz@pkgsrc.org> | 2008-11-05 12:29:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2008-11-05 12:29:04 +0000 |
| commit | 65d868491b8f1d1da6c2d3a939158f56396cefb9 (patch) | |
| tree | ec75b5de87e515fdc360c6e115fcd06feffbef79 /devel/ncc | |
| parent | 9a9e54c0b6b41d1b17b4ab9a8ccfeb97525c1b07 (diff) | |
| download | pkgsrc-65d868491b8f1d1da6c2d3a939158f56396cefb9.tar.gz | |
Fix segfaults on some sources using nested structs, unions and
(anonymous) bit fields.
Install nccstrip2.py (used by nccld).
From Marko Schuetz in PR 39840.
Bump PKGREVISION.
Diffstat (limited to 'devel/ncc')
| -rw-r--r-- | devel/ncc/Makefile | 6 | ||||
| -rw-r--r-- | devel/ncc/PLIST | 3 | ||||
| -rw-r--r-- | devel/ncc/distinfo | 3 | ||||
| -rw-r--r-- | devel/ncc/patches/patch-ae | 22 |
4 files changed, 31 insertions, 3 deletions
diff --git a/devel/ncc/Makefile b/devel/ncc/Makefile index 0d746f8ca68..1f217e5fdaa 100644 --- a/devel/ncc/Makefile +++ b/devel/ncc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/10/20 07:52:26 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2008/11/05 12:29:04 wiz Exp $ # DISTNAME= ncc-2.8 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://students.ceid.upatras.gr/~sxanth/ncc/ @@ -20,9 +21,11 @@ SUBST_MESSAGE.prefix= Fixing hardcoded paths SUBST_FILES.prefix= config.h SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' +PYTHON_PATCH_SCRIPTS+= scripts/nccstrip2.py do-install: ${INSTALL_PROGRAM} ${WRKSRC}/objdir/ncc ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/nccstrip2.py ${PREFIX}/bin ${LN} -s ncc ${PREFIX}/bin/nccar ${LN} -s ncc ${PREFIX}/bin/nccc++ ${LN} -s ncc ${PREFIX}/bin/nccld @@ -38,4 +41,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ncc .include "../../devel/ncurses/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ncc/PLIST b/devel/ncc/PLIST index ee01ccb5691..d8c638ab66e 100644 --- a/devel/ncc/PLIST +++ b/devel/ncc/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/20 07:52:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/11/05 12:29:04 wiz Exp $ bin/ncc bin/nccar bin/nccc++ bin/nccld bin/nccnav bin/nccnavi +bin/nccstrip2.py man/man1/ncc.1 share/doc/ncc/KEYS.txt share/doc/ncc/README diff --git a/devel/ncc/distinfo b/devel/ncc/distinfo index 552acf115a8..00b2302d971 100644 --- a/devel/ncc/distinfo +++ b/devel/ncc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/10/20 07:52:26 wiz Exp $ +$NetBSD: distinfo,v 1.2 2008/11/05 12:29:04 wiz Exp $ SHA1 (ncc-2.8.tar.gz) = 96f6d8d76dc0e67a436b7f1acf67503998ad5771 RMD160 (ncc-2.8.tar.gz) = dcd8998ff31d1291208bf9ea4ff5a08b2525745d @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 65ff800adf6dacab59553d13fa9f31d8b101103f SHA1 (patch-ab) = 92ada3f6f824d18a05a6e38d2f1086ebaa87e98e SHA1 (patch-ac) = 437150dbe18e5d2c8c175667f3fa6b1d419f452a SHA1 (patch-ad) = 0bc35544a5fe07112ee53ff5864d3a0d0f011e6e +SHA1 (patch-ae) = 2397a601229a211c379450b83cad69fcfd6d9022 diff --git a/devel/ncc/patches/patch-ae b/devel/ncc/patches/patch-ae new file mode 100644 index 00000000000..ad541d6f4c9 --- /dev/null +++ b/devel/ncc/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1 2008/11/05 12:29:04 wiz Exp $ + +--- cdb.C.orig 2008-10-11 14:57:21.000000000 +0000 ++++ cdb.C +@@ -394,6 +394,9 @@ void close_region () + + lookup_t *Lookup (Symbol s, bool tagged, RegionPtr r) + { ++ if (s == -1) ++ return NULL; ++ + lookup_t *t = lookup_table [s - SYMBASE]; + + if (tagged) for (; t; t = t->next) { +@@ -1175,6 +1178,7 @@ void aeqn::prstruct (RegionPtr p) + txt [txti++] = UNI; + for (m = regions [p].first; m; m=m->next) { + L = Lookup (m->s, false, p); ++ if (!L) continue; + txt [txti++] = m->s; + base = base_of (L->info.tdf); + spec = spec_of (L->info.tdf); |