From 33bff173fbd52bcca0912f0caf11b91fd11a542d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Mar 2018 05:12:13 +0100 Subject: flex: update to 2.6.4 --- package/flex/Makefile | 5 ++--- package/flex/patches/patch-Makefile_am | 8 ++++---- package/flex/patches/patch-configure_ac | 10 +++++----- package/flex/patches/patch-src_Makefile_am | 29 ++++++++++++++--------------- 4 files changed, 25 insertions(+), 27 deletions(-) (limited to 'package/flex') diff --git a/package/flex/Makefile b/package/flex/Makefile index 5bb2352d7..56ae93305 100644 --- a/package/flex/Makefile +++ b/package/flex/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= flex -PKG_VERSION:= 2.6.2 +PKG_VERSION:= 2.6.4 PKG_RELEASE:= 1 -PKG_HASH:= 9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9 +PKG_HASH:= e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 PKG_DESCR:= fast lexical analyzer PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host @@ -27,7 +27,6 @@ AUTOTOOL_STYLE:= autoreconf HOST_MAKE_FLAGS+= STAGE1FLEX=$(WRKSRC)/src/stage1flex MAKE_FLAGS+= STAGE1FLEX=$(STAGING_HOST_DIR)/usr/bin/stage1flex CONFIGURE_ENV+= ac_cv_path_HELP2MAN=true -CONFIGURE_ARGS+= --disable-shared hostpost-install: (cd $(STAGING_HOST_DIR)/usr/bin; ln -sf flex lex) diff --git a/package/flex/patches/patch-Makefile_am b/package/flex/patches/patch-Makefile_am index 6904acae3..92bfe605b 100644 --- a/package/flex/patches/patch-Makefile_am +++ b/package/flex/patches/patch-Makefile_am @@ -1,8 +1,8 @@ ---- flex-2.6.2.orig/Makefile.am 2016-10-21 02:43:44.000000000 +0200 -+++ flex-2.6.2/Makefile.am 2016-11-01 14:32:34.899271200 +0100 -@@ -45,10 +45,6 @@ EXTRA_DIST = \ +--- flex-2.6.4.orig/Makefile.am 2017-05-03 21:16:37.000000000 +0100 ++++ flex-2.6.4/Makefile.am 2018-03-14 05:10:52.408504620 +0100 +@@ -43,10 +43,6 @@ EXTRA_DIST = \ + SUBDIRS = \ - lib \ src \ - doc \ - examples \ diff --git a/package/flex/patches/patch-configure_ac b/package/flex/patches/patch-configure_ac index 3b6b448c4..2f7599357 100644 --- a/package/flex/patches/patch-configure_ac +++ b/package/flex/patches/patch-configure_ac @@ -1,11 +1,11 @@ ---- flex-2.6.2.orig/configure.ac 2016-10-25 00:13:14.000000000 +0200 -+++ flex-2.6.2/configure.ac 2016-11-01 14:32:44.985688700 +0100 +--- flex-2.6.4.orig/configure.ac 2017-05-03 21:16:37.000000000 +0100 ++++ flex-2.6.4/configure.ac 2018-03-14 05:11:52.278756139 +0100 @@ -37,8 +37,6 @@ AC_SUBST(SHARED_VERSION_INFO) # checks for programs -AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.19]) +-AM_GNU_GETTEXT_VERSION([0.18]) AC_PROG_YACC - AM_PROG_LEX - AC_PROG_CC + AS_IF([test "$YACC" != 'bison -y'], [ + YACC="\${top_srcdir}/build-aux/missing bison -y" diff --git a/package/flex/patches/patch-src_Makefile_am b/package/flex/patches/patch-src_Makefile_am index f3c194f18..08101aefa 100644 --- a/package/flex/patches/patch-src_Makefile_am +++ b/package/flex/patches/patch-src_Makefile_am @@ -1,21 +1,20 @@ -diff -Naur flex-2.6.2.orig/src/Makefile.am flex-2.6.2/src/Makefile.am ---- flex-2.6.2.orig/src/Makefile.am 2016-11-17 10:01:21.562334589 +0100 -+++ flex-2.6.2/src/Makefile.am 2016-11-17 09:21:48.766889968 +0100 -@@ -54,7 +54,7 @@ +--- flex-2.6.4.orig/src/Makefile.am 2017-05-03 21:16:37.000000000 +0100 ++++ flex-2.6.4/src/Makefile.am 2018-03-14 05:13:19.297668253 +0100 +@@ -77,7 +77,7 @@ COMMON_SOURCES = \ version.h \ yylex.c --LDADD = ../lib/libcompat.la @LIBINTL@ -+LDADD = ../lib/libcompat.la +-LDADD = $(LIBOBJS) @LIBINTL@ ++LDADD = $(LIBOBJS) - libfl_la_SOURCES = \ - libmain.c \ -@@ -90,7 +90,7 @@ - mv $@.tmp $@ + include_HEADERS = \ + FlexLexer.h +@@ -97,7 +97,7 @@ skel.c: flex.skl mkskel.sh flexint.h tab + if ENABLE_BOOTSTRAP stage1scan.c: scan.l stage1flex$(EXEEXT) -- ./stage1flex$(EXEEXT) -o $@ $< -+ $(STAGE1FLEX) -o $@ $< - - # make needs to be told to make parse.h so that parallelized runs will - # not fail. +- ./stage1flex$(EXEEXT) $(AM_LFLAGS) $(LFLAGS) -o $@ $(srcdir)/scan.l ++ $(STAGE1FLEX) $(AM_LFLAGS) $(LFLAGS) -o $@ $(srcdir)/scan.l + else + stage1scan.c: scan.c + sed 's|^\(#line .*\)"'`printf %s $< | sed 's|[][\\\\.*]|\\\\&|g'`'"|\1"$@"|g' $< > $@ -- cgit v1.2.3