diff options
Diffstat (limited to 'tools/flex')
| -rw-r--r-- | tools/flex/Makefile | 19 | ||||
| -rw-r--r-- | tools/flex/patches/100-disable-tests-docs.patch | 13 | ||||
| -rw-r--r-- | tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch | 27 |
3 files changed, 52 insertions, 7 deletions
diff --git a/tools/flex/Makefile b/tools/flex/Makefile index 2fcc2c643fd..1eff81f3451 100644 --- a/tools/flex/Makefile +++ b/tools/flex/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2008 OpenWrt.org +# +# Copyright (C) 2008-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,15 +7,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flex -PKG_VERSION:=2.5.35 +PKG_CPE_ID:=cpe:/a:flex_project:flex +PKG_VERSION:=2.6.4 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/westes/flex/releases/download/v$(PKG_VERSION)/ +PKG_HASH:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=10714e50cea54dc7a227e3eddcd44d57 -PKG_CAT:=bzcat +HOST_FIXUP:=autoreconf +HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +HOST_CONFIGURE_ARGS += --disable-shared + define Host/Clean -$(MAKE) -C $(HOST_BUILD_DIR) uninstall $(call Host/Clean/Default) diff --git a/tools/flex/patches/100-disable-tests-docs.patch b/tools/flex/patches/100-disable-tests-docs.patch new file mode 100644 index 00000000000..f7097f2127d --- /dev/null +++ b/tools/flex/patches/100-disable-tests-docs.patch @@ -0,0 +1,13 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -43,10 +43,7 @@ EXTRA_DIST = \ + + SUBDIRS = \ + src \ +- doc \ +- examples \ + po \ +- tests \ + tools + + # Create the ChangeLog, but only if we're inside a git working directory diff --git a/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch b/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch new file mode 100644 index 00000000000..7c3645c4747 --- /dev/null +++ b/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch @@ -0,0 +1,27 @@ +From 24fd0551333e7eded87b64dd36062da3df2f6380 Mon Sep 17 00:00:00 2001 +From: Explorer09 <explorer09@gmail.com> +Date: Mon, 4 Sep 2017 10:47:33 +0800 +Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac. + +This would, e.g. define _GNU_SOURCE in config.h, enabling the +reallocarray() prototype in glibc 2.26+ on Linux systems with that +version of glibc. + +Fixes #241. +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +--- 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.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects]) + AC_CONFIG_HEADER([src/config.h]) |