summaryrefslogtreecommitdiff
path: root/distro/packages/patches
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-11-22 18:22:48 +0100
committerLudovic Courtès <ludo@gnu.org>2012-11-22 18:22:48 +0100
commite2b2c46693896bfc715afa2ff6f5f34ba73158aa (patch)
tree03ecc20b932f5a345907bbd17350d16ebb9ec386 /distro/packages/patches
parentcf153fc4726c616f5c5608797f02bb71b573140b (diff)
downloadguix-patches-e2b2c46693896bfc715afa2ff6f5f34ba73158aa.tar
guix-patches-e2b2c46693896bfc715afa2ff6f5f34ba73158aa.tar.gz
distro: Add Flex.
* distro/packages/flex.scm, distro/packages/patches/flex-bison-tests.patch: New files. * Makefile.am (MODULES): Add `flex.scm'. (dist_patch_DATA): Add `flex-bison-tests.patch'.
Diffstat (limited to 'distro/packages/patches')
-rw-r--r--distro/packages/patches/flex-bison-tests.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/distro/packages/patches/flex-bison-tests.patch b/distro/packages/patches/flex-bison-tests.patch
new file mode 100644
index 0000000000..0f372f83bf
--- /dev/null
+++ b/distro/packages/patches/flex-bison-tests.patch
@@ -0,0 +1,24 @@
+The `test-bison-yyl{loc,val}' tests fail with "conflicting types for
+'testparse'" because `YYPARSE_PARAM' is undefined; work around that.
+
+--- flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:01.000000000 +0100
++++ flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:07.000000000 +0100
+@@ -21,6 +21,7 @@
+ * PURPOSE.
+ */
+
++#define YYPARSE_PARAM scanner
+ #include "parser.h"
+ #include "scanner.h"
+
+
+--- flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:42.000000000 +0100
++++ flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:49.000000000 +0100
+@@ -21,6 +21,7 @@
+ * PURPOSE.
+ */
+
++#define YYPARSE_PARAM scanner
+ #include "parser.h"
+ #include "scanner.h"
+