[pkgsrc/trunk]: pkgsrc/devel/bison devel/bison: resulting glr.c contains inco...

[rumko <rumko%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4282a8158713
branches:  trunk
changeset: 644727:4282a8158713
user:      rumko <rumko%pkgsrc.org@localhost>
date:      Fri Jan 16 19:34:44 2015 +0000

description:
devel/bison: resulting glr.c contains incorrect attribute order

For yyFail and yyMemoryExhausted, the ordering of _Noreturn is
incorrect on at least fbsd with clang.

Runtime issue, PKGREVISION bumped.

Ok@ joerg

diffstat:

 devel/bison/Makefile                 |   4 ++--
 devel/bison/distinfo                 |   3 ++-
 devel/bison/patches/patch-data_glr.c |  25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r b1931c6c88f4 -r 4282a8158713 devel/bison/Makefile
--- a/devel/bison/Makefile      Fri Jan 16 19:34:23 2015 +0000
+++ b/devel/bison/Makefile      Fri Jan 16 19:34:44 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2014/10/09 14:06:08 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2015/01/16 19:34:44 rumko Exp $
 
 DISTNAME=      bison-3.0.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=  .tar.xz
diff -r b1931c6c88f4 -r 4282a8158713 devel/bison/distinfo
--- a/devel/bison/distinfo      Fri Jan 16 19:34:23 2015 +0000
+++ b/devel/bison/distinfo      Fri Jan 16 19:34:44 2015 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.39 2014/01/10 09:40:44 pho Exp $
+$NetBSD: distinfo,v 1.40 2015/01/16 19:34:44 rumko Exp $
 
 SHA1 (bison-3.0.2.tar.xz) = aeb1e3544007124009e5203afe86a5676580d444
 RMD160 (bison-3.0.2.tar.xz) = 0a945ce5710a79332fbe594255305f244c24dd74
 Size (bison-3.0.2.tar.xz) = 1927296 bytes
 SHA1 (patch-Makefile.in) = 3baa1974d877e921c88b30c730739f8350599060
+SHA1 (patch-data_glr.c) = a2e0900ed995e4320e80f8ed05eae8e82be50502
 SHA1 (patch-lib_isnan.c) = c5d2603447064c95e8bbc75a24c09366b752bad6
diff -r b1931c6c88f4 -r 4282a8158713 devel/bison/patches/patch-data_glr.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bison/patches/patch-data_glr.c      Fri Jan 16 19:34:44 2015 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-data_glr.c,v 1.1 2015/01/16 19:34:44 rumko Exp $
+
+Fixes "error: an attribute list cannot appear here" on fbsd
+under clang
+
+--- data/glr.c.orig    2013-11-14 15:01:22.000000000 +0000
++++ data/glr.c
+@@ -669,7 +669,7 @@ struct yyGLRStack {
+ static void yyexpandGLRStack (yyGLRStack* yystackp);
+ #endif
+ 
+-static _Noreturn void
++_Noreturn static void
+ yyFail (yyGLRStack* yystackp]b4_pure_formals[, const char* yymsg)
+ {
+   if (yymsg != YY_NULLPTR)
+@@ -677,7 +677,7 @@ yyFail (yyGLRStack* yystackp]b4_pure_for
+   YYLONGJMP (yystackp->yyexception_buffer, 1);
+ }
+ 
+-static _Noreturn void
++_Noreturn static void
+ yyMemoryExhausted (yyGLRStack* yystackp)
+ {
+   YYLONGJMP (yystackp->yyexception_buffer, 2);