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 <hannu.nyman@iki.fi>

SVN-Revision: 49025
master
John Crispin 9 years ago
parent 99414dbcf1
commit ae30ad61fb
  1. 11
      tools/flex/Makefile
  2. 13
      tools/flex/patches/100-disable-tests-docs.patch
  3. 18
      tools/flex/patches/100-remove_no_undefined.patch

@ -1,5 +1,5 @@
#
# 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.
@ -7,12 +7,11 @@
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

@ -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

@ -1,18 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,13 +73,13 @@ libfl_la_SOURCES = \
libmain.c \
libyywrap.c
-libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
+libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
libfl_pic_la_SOURCES = \
libmain.c \
libyywrap.c
-libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
+libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
noinst_HEADERS = \
flexdef.h \
Loading…
Cancel
Save