app-emulation/dosemu: fix build failure against flex-2.6.3, bug #604610

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/604610

Package-Manager: Portage-2.3.3_p17, Repoman-2.3.1_p10

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
index 8a0011cbc40909028e590b3d65fbf877ba804727..8bb88616b209d2674497487510897f5e5769fbab 100644 (file)
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -47,6 +47,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${P}-fortify.patch
        epatch "${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch
        epatch "${FILESDIR}"/${P}-no-glibc.patch
+       epatch "${FILESDIR}"/${P}-flex-2.6.3.patch
 
        epatch_user
 

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
new file mode 100644 (file)
index 0000000..de5b00b
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-flex-2.6.3.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/604610
+
+New flex seems to define yywrap even for non-yywrap lexers.
+diff --git a/src/base/init/lexer.l.in b/src/base/init/lexer.l.in
+index aeaa2e2..9e42ddf 100644
+--- a/src/base/init/lexer.l.in
++++ b/src/base/init/lexer.l.in
+@@ -810,7 +810,2 @@ static void enter_includefile(char * fname)
+ 
+-
+-#ifdef yywrap
+-  error "yywrap defined elsewere, need our own one"
+-#endif
+-
+ int yywrap(void)    /* this gets called at EOF of a parsed file */