Wed Feb 15 16:42:36 2012 UTC ()
Make giscanner ignore the "volatile" variants of __asm{,__} as well.
Found by OBATA Akio, fixes PR pkg/46017.


(martin)
diff -r1.7 -r1.8 pkgsrc/devel/gobject-introspection/distinfo
diff -r0 -r1.1 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
cvs diff -r1.7 -r1.8 pkgsrc/devel/gobject-introspection/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/distinfo 2012/02/10 15:14:56 1.7
+++ pkgsrc/devel/gobject-introspection/distinfo 2012/02/15 16:42:36 1.8
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.7 2012/02/10 15:14:56 drochner Exp $ 1$NetBSD: distinfo,v 1.8 2012/02/15 16:42:36 martin Exp $
2 2
3SHA1 (gobject-introspection-1.30.0.tar.bz2) = 58a313e758917ae0760c5147b6dd72af840927cf 3SHA1 (gobject-introspection-1.30.0.tar.bz2) = 58a313e758917ae0760c5147b6dd72af840927cf
4RMD160 (gobject-introspection-1.30.0.tar.bz2) = ebc44388f628ae80ad2150afeb7df3fc49032309 4RMD160 (gobject-introspection-1.30.0.tar.bz2) = ebc44388f628ae80ad2150afeb7df3fc49032309
5Size (gobject-introspection-1.30.0.tar.bz2) = 1279723 bytes 5Size (gobject-introspection-1.30.0.tar.bz2) = 1279723 bytes
6SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b 6SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
7SHA1 (patch-ab) = 5cb15e68a1f249f2975d661daf566cc2ec1f6102 7SHA1 (patch-ab) = 5cb15e68a1f249f2975d661daf566cc2ec1f6102
8SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4 8SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4
9SHA1 (patch-ad) = 4086722fa0f51c332536002db36b9edbe2e71a2a 9SHA1 (patch-ad) = 4086722fa0f51c332536002db36b9edbe2e71a2a
10SHA1 (patch-ae) = c29edcabecc236f40fd69fb909c45e1a2eddaa6d 10SHA1 (patch-ae) = c29edcabecc236f40fd69fb909c45e1a2eddaa6d
11SHA1 (patch-af) = 974878388616ca066902d0f3cd20b5dd5c1b3c10 11SHA1 (patch-af) = 974878388616ca066902d0f3cd20b5dd5c1b3c10
 12SHA1 (patch-giscanner_scannerlexer.l) = 69152ebb060b87083d32aff6ad2a6195c9987c59
File Added: pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_scannerlexer.l
$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; }