From 77578fdd2c1bc23b7847d03d63eb8d63d283fc16 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 2 Dec 2015 00:59:09 -0800 Subject: [PATCH] Compress lexer tables for usual download in Cydia. --- Makefile.am | 2 +- Makefile.in | 3 ++- Scanner.lpp.in | 3 --- apple-configure.sh | 2 +- configure | 8 ++++++++ configure.ac | 3 +++ 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 343b050..e67adb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,7 @@ Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l CLEANFILES += Scanner.cpp Scanner.output lex.backup Scanner.cpp: Scanner.lpp - $(FLEX) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false) + $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false) grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null ! grep -F ': warning, ' Scanner.output || true diff --git a/Makefile.in b/Makefile.in index 9d6be43..04b082e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -426,6 +426,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LFLAGS = @LFLAGS@ LIBFFI_CFLAGS = @LIBFFI_CFLAGS@ LIBFFI_LIBS = @LIBFFI_LIBS@ LIBOBJS = @LIBOBJS@ @@ -1308,7 +1309,7 @@ Parser.ypp: Parser.ypp.in Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l $(srcdir)/Filter.sh $< >$@ $(filters) Scanner.cpp: Scanner.lpp - $(FLEX) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false) + $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false) grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null ! grep -F ': warning, ' Scanner.output || true diff --git a/Scanner.lpp.in b/Scanner.lpp.in index bcbd0d0..e56b547 100644 --- a/Scanner.lpp.in +++ b/Scanner.lpp.in @@ -204,9 +204,6 @@ static void U(char *&local, const char *text, yy_size_t &i) { %option reentrant %option stack -%option full -%option ecs - U1 [\x00-\x7f] U0 [\x80-\xbf] U2 [\xc2-\xdf] diff --git a/apple-configure.sh b/apple-configure.sh index 457cbf6..7e1c50d 100755 --- a/apple-configure.sh +++ b/apple-configure.sh @@ -116,5 +116,5 @@ for arch in armv6 armv7 armv7s arm64; do build "ios-${arch}" iphoneos "-arch ${arch} -miphoneos-version-min=${min}" --host=arm-apple-darwin10 \ CFLAGS="${gof[*]}" CXXFLAGS="${gof[*]}" OBJCXXFLAGS="${gof[*]}" \ - CPPFLAGS="${cpf}" LDFLAGS="${ldf}" "${flg[@]}" --host=arm-apple-darwin10 + CPPFLAGS="${cpf}" LDFLAGS="${ldf}" LFLAGS="--ecs --meta-ecs" "${flg[@]}" done diff --git a/configure b/configure index 8be0f21..b537939 100755 --- a/configure +++ b/configure @@ -669,6 +669,7 @@ PTHREAD_CFLAGS PTHREAD_LIBS PTHREAD_CC ax_pthread_config +LFLAGS GNUTAR GPERF FLEX @@ -849,6 +850,7 @@ BISON FLEX GPERF GNUTAR +LFLAGS WEBKIT_CFLAGS WEBKIT_LIBS LIBFFI_CFLAGS @@ -1530,6 +1532,7 @@ Some influential environment variables: FLEX the fast lexical analyser generator GPERF perfect hash function generator GNUTAR a very sticky lump of files + LFLAGS flex flags WEBKIT_CFLAGS C compiler flags for WEBKIT, overriding pkg-config WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config @@ -17229,6 +17232,11 @@ fi +if test "x$LFLAGS" = x; then : + LFLAGS="--full --ecs" +fi + + diff --git a/configure.ac b/configure.ac index a8ef86b..b482870 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,9 @@ AC_DEFUN([CY_TRY], [ AS_IF([test "x$cy_good" = x1], ]$4[, ]$5[) ]) dnl }}} +AC_ARG_VAR([LFLAGS], [flex flags]) +AS_IF([test "x$LFLAGS" = x], [LFLAGS="--full --ecs"]) + AC_DEFUN([CY_TEST_FLAG_], [ AC_LANG_PUSH(]$2[) AC_MSG_CHECKING([for ]]$4[[ ]]$1[) -- 2.47.2