wine: fix compile for flex-2.6.3

This commit is contained in:
Danny Rawlins 2017-01-07 19:18:02 +11:00
parent bd95d3c8d3
commit 2132f25ab2
3 changed files with 33 additions and 2 deletions

View File

@ -2,3 +2,4 @@
b0760cf51527b70435c3e4d0361a129a wine-mono-4.6.4.msi
5ebc4ec71c92b3db3d84b334a1db385d wine_gecko-2.47-x86.msi
d93ac0d2e6aceafe9113a9918916df45 wine_gecko-2.47-x86_64.msi
c14769c348a31678f30965f38e5e5a95 winhlp32-macro-flex-2.6.3-flex.patch

View File

@ -6,17 +6,22 @@
name=wine
version=2.0-rc3
release=1
release=2
source=(http://dl.winehq.org/wine/source/2.0/$name-$version.tar.bz2
http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi
http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi
http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi)
http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi
winhlp32-macro-flex-2.6.3-flex.patch)
build() {
install -d wine32 wine64
export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
# undefined reference yywrap in winhlp32/macro.lex.yy.c
# when building with flex-2.6.3
patch -d $name-$version -p1 -i $SRC/winhlp32-macro-flex-2.6.3-flex.patch
cd wine64
../$name-$version/configure \

View File

@ -0,0 +1,25 @@
https://bugs.winehq.org/show_bug.cgi?id=42132
Bug 42132 - undefined reference yywrap in winhlp32/macro.lex.yy.c when building with flex-2.6.3
$ git diff
diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
index 8f6945ca98..ff8a4832d3 100644
--- a/programs/winhlp32/macro.lex.l
+++ b/programs/winhlp32/macro.lex.l
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
%}
-%option noinput nounput never-interactive 8bit
+%option noinput nounput noyywrap never-interactive 8bit
%x quote
%{
#include "config.h"
@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
{
return lex_data ? lex_data->window : Globals.active_win;
}
-
-#ifndef yywrap
-int yywrap(void) { return 1; }
-#endif