| 1 |
commit: bff8d740d09de0bbb40af7bf3aeff479cfea55d3 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 4 11:28:38 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 4 11:28:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff8d740 |
| 7 |
|
| 8 |
app-emulation/dosemu: fix build failure against flex-2.6.3, bug #604610 |
| 9 |
|
| 10 |
Reported-by: Toralf Förster |
| 11 |
Bug: https://bugs.gentoo.org/604610 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3_p17, Repoman-2.3.1_p10 |
| 14 |
|
| 15 |
app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild | 3 ++- |
| 16 |
.../files/dosemu-1.4.1_pre20130107-flex-2.6.3.patch | 15 +++++++++++++++ |
| 17 |
2 files changed, 17 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild |
| 20 |
index 8a0011c..8bb8861 100644 |
| 21 |
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild |
| 22 |
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2016 Gentoo Foundation |
| 25 |
+# Copyright 1999-2017 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
# $Id$ |
| 28 |
|
| 29 |
@@ -47,6 +47,7 @@ src_prepare() { |
| 30 |
epatch "${FILESDIR}"/${P}-fortify.patch |
| 31 |
epatch "${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch |
| 32 |
epatch "${FILESDIR}"/${P}-no-glibc.patch |
| 33 |
+ epatch "${FILESDIR}"/${P}-flex-2.6.3.patch |
| 34 |
|
| 35 |
epatch_user |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-flex-2.6.3.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-flex-2.6.3.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000..de5b00b |
| 41 |
--- /dev/null |
| 42 |
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-flex-2.6.3.patch |
| 43 |
@@ -0,0 +1,15 @@ |
| 44 |
+https://bugs.gentoo.org/604610 |
| 45 |
+ |
| 46 |
+New flex seems to define yywrap even for non-yywrap lexers. |
| 47 |
+diff --git a/src/base/init/lexer.l.in b/src/base/init/lexer.l.in |
| 48 |
+index aeaa2e2..9e42ddf 100644 |
| 49 |
+--- a/src/base/init/lexer.l.in |
| 50 |
++++ b/src/base/init/lexer.l.in |
| 51 |
+@@ -810,7 +810,2 @@ static void enter_includefile(char * fname) |
| 52 |
+ |
| 53 |
+- |
| 54 |
+-#ifdef yywrap |
| 55 |
+- error "yywrap defined elsewere, need our own one" |
| 56 |
+-#endif |
| 57 |
+- |
| 58 |
+ int yywrap(void) /* this gets called at EOF of a parsed file */ |
Archives