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

4 files changed, 34 insertions, 21 deletions

diff --git a/package/flex/Makefile b/package/flex/Makefile
index bcb752d56..23f29e9a1 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		flex
-PKG_VERSION:=		2.6.0
+PKG_VERSION:=		2.6.1
 PKG_RELEASE:=		1
-PKG_HASH:=		d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73
+PKG_HASH:=		2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
 PKG_DESCR:=		fast lexical analyzer
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host
 HOST_BUILDDEP:=		patch-host m4-host
-PKG_URL:=		http://flex.sourceforge.net/
-PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=flex/)
+PKG_URL:=		https://github.com/westes/flex
+PKG_SITES:=		https://github.com/westes/flex/releases/download/v2.6.1/
 PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/host.mk
@@ -21,16 +21,18 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE)))
 $(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
+AUTOTOOL_STYLE:=	autoreconf
+HOST_MAKE_FLAGS+=	STAGE1FLEX=$(WRKSRC)/src/stage1flex
+MAKE_FLAGS+=		STAGE1FLEX=$(STAGING_HOST_DIR)/usr/bin/stage1flex
+CONFIGURE_ARGS+=	--disable-shared
+
 hostpost-install:
 	(cd $(STAGING_HOST_DIR)/usr/bin; ln -sf flex lex)
+	$(CP) $(WRKBUILD)/src/stage1flex $(STAGING_HOST_DIR)/usr/bin
 
 flex-install:
 	$(INSTALL_DIR) $(IDIR_FLEX)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/flex $(IDIR_FLEX)/usr/bin
-	# workaround for dev subpackage
-	$(INSTALL_DIR) $(IDIR_FLEX_DEV)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libfl.a \
-		$(IDIR_FLEX_DEV)/usr/lib
 
 include $(ADK_TOPDIR)/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
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'