diff options
| author | martin <martin@pkgsrc.org> | 2012-02-15 16:42:36 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2012-02-15 16:42:36 +0000 |
| commit | 04d21348b053e0127ccea59fedf647e683b9677b (patch) | |
| tree | 4f9d8ed00632142f248fc9e73149c3cba97c3d7c | |
| parent | 146109fe94e6f34670103179507ace1ee5568e5c (diff) | |
| download | pkgsrc-04d21348b053e0127ccea59fedf647e683b9677b.tar.gz | |
Make giscanner ignore the "volatile" variants of __asm{,__} as well.
Found by OBATA Akio, fixes PR pkg/46017.
| -rw-r--r-- | devel/gobject-introspection/distinfo | 3 | ||||
| -rw-r--r-- | devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index 2f57a0eb23b..85e421bda35 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2012/02/10 15:14:56 drochner Exp $ +$NetBSD: distinfo,v 1.8 2012/02/15 16:42:36 martin Exp $ SHA1 (gobject-introspection-1.30.0.tar.bz2) = 58a313e758917ae0760c5147b6dd72af840927cf RMD160 (gobject-introspection-1.30.0.tar.bz2) = ebc44388f628ae80ad2150afeb7df3fc49032309 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4 SHA1 (patch-ad) = 4086722fa0f51c332536002db36b9edbe2e71a2a SHA1 (patch-ae) = c29edcabecc236f40fd69fb909c45e1a2eddaa6d SHA1 (patch-af) = 974878388616ca066902d0f3cd20b5dd5c1b3c10 +SHA1 (patch-giscanner_scannerlexer.l) = 69152ebb060b87083d32aff6ad2a6195c9987c59 diff --git a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l new file mode 100644 index 00000000000..aa469764006 --- /dev/null +++ b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l @@ -0,0 +1,13 @@ +$NetBSD: patch-giscanner_scannerlexer.l,v 1.1 2012/02/15 16:42:36 martin Exp $ + +--- giscanner/scannerlexer.l.orig 2011-06-10 17:36:50.000000000 +0200 ++++ giscanner/scannerlexer.l 2012-02-15 16:10:33.000000000 +0100 +@@ -134,6 +134,8 @@ + "," { return ','; } + "->" { return ARROW; } + ++"__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } ++"__asm__"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } + "__asm" { if (!parse_ignored_macro()) REJECT; } + "__asm__" { if (!parse_ignored_macro()) REJECT; } + "__attribute__" { if (!parse_ignored_macro()) REJECT; } |