tools/flex: update to 2.6.1

Update flex to 2.6.1 * Flex has moved to Github, adjust download link * Remove patch that has been applied upstream * Disable building tests to avoid circular dependency to bison - disable also docs and examples at the same time Signed-off-by: Hannu Nyman <[email protected]> SVN-Revision: 49025
darkwrat · Mar 16, 2016 · ae30ad6 · ae30ad6
1 parent 99414db
commit ae30ad6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/tools/flex/Makefile b/tools/flex/Makefile
@@ -1,18 +1,17 @@
 # 
-# Copyright (C) 2008-2014 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.
 #
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=flex
-PKG_VERSION:=2.5.39
+PKG_VERSION:=2.6.1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=77d44c6bb8c0705e0017ab9a84a1502b
-PKG_CAT:=bzcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://github.com/westes/flex/releases/download/v$(PKG_VERSION)/
+PKG_MD5SUM:=cd3c86290fc2676a641aefafeb10848a
 
 HOST_BUILD_PARALLEL:=1
 

diff --git a/tools/flex/patches/100-disable-tests-docs.patch b/tools/flex/patches/100-disable-tests-docs.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -45,10 +45,7 @@
+ SUBDIRS = \
+ 	lib \
+ 	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/100-remove_no_undefined.patch b/tools/flex/patches/100-remove_no_undefined.patch