diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk index 707b104c23..a0981746a7 100644 --- a/packages/devel/flex/package.mk +++ b/packages/devel/flex/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="flex" -PKG_VERSION="2.6.0" -PKG_SHA256="24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" +PKG_VERSION="2.6.4" +PKG_SHA256="e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995" PKG_LICENSE="GPL" -PKG_SITE="http://flex.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_SITE="https://github.com/westes/flex" +PKG_URL="https://github.com/westes/flex/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="ccache:host m4:host autotools:host bison:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text." diff --git a/packages/devel/flex/patches/c5a26b17a2b091c560f6c4e6703e55f496bf74fa.patch b/packages/devel/flex/patches/c5a26b17a2b091c560f6c4e6703e55f496bf74fa.patch new file mode 100644 index 0000000000..22592df348 --- /dev/null +++ b/packages/devel/flex/patches/c5a26b17a2b091c560f6c4e6703e55f496bf74fa.patch @@ -0,0 +1,28 @@ +From c5a26b17a2b091c560f6c4e6703e55f496bf74fa Mon Sep 17 00:00:00 2001 +From: Explorer09 +Date: Mon, 4 Sep 2017 10:47:33 +0800 +Subject: [PATCH] AC_USE_SYSTEM_EXTENSIONS in configure.ac + +This would define _GNU_SOURCE in config.h, enabling the reallocarray() +prototype in glibc 2.26+. + +Fixes #241. +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index c6f12d64..3c977a4e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,8 +25,10 @@ + # autoconf requirements and initialization + + AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex]) ++AC_PREREQ([2.60]) + AC_CONFIG_SRCDIR([src/scan.l]) + AC_CONFIG_AUX_DIR([build-aux]) ++AC_USE_SYSTEM_EXTENSIONS + LT_INIT + AM_INIT_AUTOMAKE([1.15 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects]) + AC_CONFIG_HEADER([src/config.h]) diff --git a/packages/devel/flex/patches/flex-001-plex.malloc.patch b/packages/devel/flex/patches/flex-001-plex.malloc.patch deleted file mode 100644 index 54422ab7b5..0000000000 --- a/packages/devel/flex/patches/flex-001-plex.malloc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.ac 2015-02-10 15:21:25.466408144 +0100 -+++ b/configure.ac.new 2015-02-10 15:21:08.070408144 +0100 -@@ -106,9 +106,9 @@ - - AC_FUNC_ALLOCA - AC_FUNC_FORK --AC_FUNC_MALLOC --AC_FUNC_REALLOC --AC_CHECK_FUNCS([dup2 isascii memset pow regcomp setlocale strchr strtol]) -+# AC_FUNC_MALLOC -+# AC_FUNC_REALLOC -+AC_CHECK_FUNCS([malloc realloc dup2 isascii memset pow regcomp setlocale strchr strtol]) - - AC_CONFIG_FILES( - Makefile