tools: flex: fix build with automake 1.15.1

After the update of GNU automake, the flex configure fails with

    configure.ac:31: error: version mismatch.  This is Automake 1.15.1,
    configure.ac:31: but the definition used by this AM_INIT_AUTOMAKE
    configure.ac:31: comes from Automake 1.15.

Apply the autoreconf host fixup to properly regenerate configure before
to avoid triggering the version mismatch. Also refresh the patch while
we're at it.

Fixes FS#885.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/tools/flex/Makefile b/tools/flex/Makefile
index 760721a16fcc02f92c1c35592239d4a9652b5759..1398b1ae51a5273fcca71504c7a3893243e8368c 100644 (file)
--- a/tools/flex/Makefile
+++ b/tools/flex/Makefile
@@ -13,6 +13,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/westes/flex/releases/download/v$(PKG_VERSION)/
 PKG_HASH:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995
 
+HOST_FIXUP:=autoreconf
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk

diff --git a/tools/flex/patches/100-disable-tests-docs.patch b/tools/flex/patches/100-disable-tests-docs.patch
index f298bc911d275969740a662f93f4eb379a46cdfe..f7097f2127d59c11869303e7b5e77800a3a035ed 100644 (file)
--- a/tools/flex/patches/100-disable-tests-docs.patch
+++ b/tools/flex/patches/100-disable-tests-docs.patch
@@ -1,8 +1,8 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -45,10 +45,7 @@ EXTRA_DIST = \
+@@ -43,10 +43,7 @@ EXTRA_DIST = \
+ 
  SUBDIRS = \
-       lib \
        src \
 -      doc \
 -      examples \