aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2012-10-12 07:17:34 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2012-10-12 07:17:34 +0400
commit12b3f8e8d6763d3072fbcf7ad9dfe2f47e830555 (patch)
tree5cfa37d461016525d7db9fbcd45ed0d5135bfea2 /x11-misc/envytools/files
parent[x11-misc/envytools] Add envytools (diff)
downloadsci-12b3f8e8d6763d3072fbcf7ad9dfe2f47e830555.tar.gz
sci-12b3f8e8d6763d3072fbcf7ad9dfe2f47e830555.tar.bz2
sci-12b3f8e8d6763d3072fbcf7ad9dfe2f47e830555.zip
[x11-misc/envytools] Allow to build with recent bison
(Portage version: 2.2.0_alpha136/git/Linux x86_64)
Diffstat (limited to 'x11-misc/envytools/files')
-rw-r--r--x11-misc/envytools/files/envytools-bison.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/x11-misc/envytools/files/envytools-bison.patch b/x11-misc/envytools/files/envytools-bison.patch
new file mode 100644
index 000000000..0a9e4f649
--- /dev/null
+++ b/x11-misc/envytools/files/envytools-bison.patch
@@ -0,0 +1,27 @@
+From: Marcin Slusarz <address@hidden>
+Subject: [PATCH] easm: fix build with bison >= 2.6
+
+easm_parse.h started to reference yyscan_t, which is defined in easm_lex.h,
+but we can't include easm_lex.h before easm_parse.h, because easm_lex.h
+uses YYSTYPE which is defined in easm_parse.h.
+To fix this, break the circular dependency by injecting definition of yyscan_t
+before including anything.
+---
+ easm/easm_parse.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/easm/easm_parse.y b/easm/easm_parse.y
+index bfac370..0b6de26 100644
+--- a/easm/easm_parse.y
++++ b/easm/easm_parse.y
+@@ -23,6 +23,7 @@
+ */
+
+ %{
++typedef void* yyscan_t;
+ #include "easm.h"
+ #include "yy.h"
+ #include "easm_parse.h"
+--
+1.7.12
+