From 865db95a98b0a59bbd22ca60b077d859c9ea0ccb Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 5 Apr 2017 03:11:24 +0000 Subject: [PATCH] flex: updated to 2.6.3 --- flex/.footprint | 5 -- flex/.md5sum | 3 +- flex/Pkgfile | 26 ++++++++-- flex/flex-2.6.3-add_defines.patch | 82 +++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 9 deletions(-) create mode 100644 flex/flex-2.6.3-add_defines.patch diff --git a/flex/.footprint b/flex/.footprint index f7aa39f..5e874fd 100644 --- a/flex/.footprint +++ b/flex/.footprint @@ -11,11 +11,6 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libfl.so -> libfl.so.2.0.0 lrwxrwxrwx root/root usr/lib/libfl.so.2 -> libfl.so.2.0.0 -rwxr-xr-x root/root usr/lib/libfl.so.2.0.0 --rw-r--r-- root/root usr/lib/libfl_pic.a --rwxr-xr-x root/root usr/lib/libfl_pic.la -lrwxrwxrwx root/root usr/lib/libfl_pic.so -> libfl_pic.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libfl_pic.so.2 -> libfl_pic.so.2.0.0 --rwxr-xr-x root/root usr/lib/libfl_pic.so.2.0.0 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/flex/.md5sum b/flex/.md5sum index ec61826..eba40b0 100644 --- a/flex/.md5sum +++ b/flex/.md5sum @@ -1 +1,2 @@ -77d44c6bb8c0705e0017ab9a84a1502b flex-2.5.39.tar.bz2 +46620c53d99157a506cfdd183c999dd6 flex-2.6.3-add_defines.patch +a5f65570cd9107ec8a8ec88f17b31bb1 flex-2.6.3.tar.gz diff --git a/flex/Pkgfile b/flex/Pkgfile index e7534fb..805f331 100644 --- a/flex/Pkgfile +++ b/flex/Pkgfile @@ -5,9 +5,10 @@ # Depends on: name=flex -version=2.5.39 +version=2.6.3 release=2 -source=(http://downloads.sourceforge.net/project/$name/$name-$version.tar.bz2) +source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz + $name-$version-add_defines.patch) build() { cd $name-$version @@ -15,13 +16,32 @@ build() { echo "ac_cv_func_malloc_0_nonnull=yes" > config.cache echo "ac_cv_func_realloc_0_nonnull=yes" >> config.cache + patch -p1 -i $SRC/$name-$version-add_defines.patch + touch doc/flex.1 + + # Don't build tests + sed '51d' -i Makefile.am + + # Build stage1flex for current host + CC=gcc CFLAGS="" ./configure --disable-nls \ + --prefix=/tools \ + --enable-shared + + make -C lib + make -C src stage1flex + mv src/stage1flex src/stage1flex.host + make distclean + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ --disable-nls \ --cache-file=config.cache - make + make -C lib + # Use stage1flex built for host + sed 's|./stage1flex$(EXEEXT) $(AM_LFLAGS)|./stage1flex.host$(EXEEXT) $(AM_LFLAGS)|g' -i src/Makefile + make -C src make DESTDIR=$PKG install ln -sf flex $PKG/usr/bin/lex diff --git a/flex/flex-2.6.3-add_defines.patch b/flex/flex-2.6.3-add_defines.patch new file mode 100644 index 0000000..f2f5eb8 --- /dev/null +++ b/flex/flex-2.6.3-add_defines.patch @@ -0,0 +1,82 @@ +From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sun, 22 Jan 2017 18:34:30 +0100 +Subject: [PATCH] Add more defines in the non-reentrant part. + +Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks +code that does #ifndef yywrap .. +--- + src/flex.skl | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/flex.skl b/src/flex.skl +index 190700f..6a7cde4 100644 +--- a/src/flex.skl ++++ b/src/flex.skl +@@ -61,11 +61,17 @@ m4_changequote([[, ]]) + m4_ifelse(M4_YY_PREFIX,yy,, + #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] + #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] +-#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] ++#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] ++#define yy_scan_string M4_YY_PREFIX[[_scan_string]] ++#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] + #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] + #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] + #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] + #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] ++#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] ++#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] ++#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] ++#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] + #define yyin M4_YY_PREFIX[[in]] + #define yyleng M4_YY_PREFIX[[leng]] + #define yylex M4_YY_PREFIX[[lex]] +@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) + + m4preproc_define(`M4_GEN_PREFIX', + ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] +-m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') ++%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + + %if-c++-only + /* The c++ scanner is a mess. The FlexLexer.h header file relies on the +@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + %endif + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`_create_buffer') + M4_GEN_PREFIX(`_delete_buffer') + M4_GEN_PREFIX(`_scan_buffer') +@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + M4_GEN_PREFIX(`set_column') + ]]) + M4_GEN_PREFIX(`wrap') ++) + %endif + + m4_ifdef( [[M4_YY_BISON_LVAL]], +@@ -170,11 +178,14 @@ m4_ifdef( [[]], + ]]) + + ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`alloc') + M4_GEN_PREFIX(`realloc') + M4_GEN_PREFIX(`free') ++) + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + m4_ifdef( [[M4_YY_NOT_REENTRANT]], + [[ + M4_GEN_PREFIX(`text') +@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], + M4_GEN_PREFIX(`_flex_debug') + M4_GEN_PREFIX(`lineno') + ]]) ++) + %endif + + -- 2.26.2