flex: update to 2.6.1, disable shared libfl as it breaks ipsec-tools compile

3 files changed, 24 insertions, 13 deletions

diff --git a/package/flex/patches/patch-Makefile_am b/package/flex/patches/patch-Makefile_am
new file mode 100644
index 000000000..31b063b6e
--- /dev/null
+++ b/package/flex/patches/patch-Makefile_am
@@ -0,0 +1,13 @@
+--- flex-2.6.1.orig/Makefile.am	2016-02-27 14:53:59.000000000 +0100
++++ flex-2.6.1/Makefile.am	2016-06-20 23:50:16.000000000 +0200
+@@ -45,10 +45,6 @@ EXTRA_DIST = \
+ SUBDIRS = \
+ 	lib \
+ 	src \
+-	doc \
+-	examples \
+-	po \
+-	tests \
+ 	tools
+ 
+ # Create the ChangeLog, but only if we're inside a git working directory
diff --git a/package/flex/patches/patch-Makefile_in b/package/flex/patches/patch-Makefile_in
deleted file mode 100644
index bff3d82e6..000000000
--- a/package/flex/patches/patch-Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- flex-2.6.0.orig/Makefile.in	2015-11-17 17:19:45.000000000 +0100
-+++ flex-2.6.0/Makefile.in	2016-04-08 22:10:39.401057770 +0200
-@@ -447,10 +447,6 @@ EXTRA_DIST = \
- SUBDIRS = \
- 	lib \
- 	src \
--	doc \
--	examples \
--	po \
--	tests \
- 	tools
- 
- all: all-recursive
diff --git a/package/flex/patches/patch-src_Makefile_am b/package/flex/patches/patch-src_Makefile_am
new file mode 100644
index 000000000..6a4168b24
--- /dev/null
+++ b/package/flex/patches/patch-src_Makefile_am
@@ -0,0 +1,11 @@
+--- flex-2.6.1.orig/src/Makefile.am	2016-02-27 14:53:59.000000000 +0100
++++ flex-2.6.1/src/Makefile.am	2016-06-20 23:42:55.000000000 +0200
+@@ -90,7 +90,7 @@ stage1scan.l: scan.l
+ 	cp $(srcdir)/scan.l $(srcdir)/stage1scan.l
+ 
+ stage1scan.c: stage1scan.l stage1flex$(EXEEXT)
+-	$(top_builddir)/src/stage1flex$(EXEEXT) -o $@ $<
++	$(STAGE1FLEX) -o $@ $<
+ 
+ # Explicitly describe dependencies.
+ # You can recreate this with `gcc -I. -MM *.c'