From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Jan 2013 02:50:39 +0000 (+0000)
Subject: flex: bump to version 2.5.37
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a58506aa0863a888863f2e9c77f6cd729cb0bd11;p=buildroot.git

flex: bump to version 2.5.37

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/package/flex/Config.in b/package/flex/Config.in
index adef46867a..90a75f4756 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_FLEX
 	  A fast lexical analyser generator.  A tool for generating
 	  programs that perform pattern-matching on text.
 
-	  http://www.gnu.org/software/flex/
+	  http://flex.sourceforge.net/
 
 config BR2_PACKAGE_FLEX_BINARY
 	bool "Install tool in the target"
diff --git a/package/flex/flex-2.5.35-prog-ar.patch b/package/flex/flex-2.5.35-prog-ar.patch
deleted file mode 100644
index e0626ff95f..0000000000
--- a/package/flex/flex-2.5.35-prog-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
diff --git a/package/flex/flex-prog-ar.patch b/package/flex/flex-prog-ar.patch
new file mode 100644
index 0000000000..e0626ff95f
--- /dev/null
+++ b/package/flex/flex-prog-ar.patch
@@ -0,0 +1,11 @@
+diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
+--- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
++++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
+@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
+ 	"$(DESTDIR)$(includedir)"
+ libLIBRARIES_INSTALL = $(INSTALL_DATA)
+ LIBRARIES = $(lib_LIBRARIES)
+-AR = ar
+ ARFLAGS = cru
+ libfl_a_AR = $(AR) $(ARFLAGS)
+ libfl_a_LIBADD =
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index b1963f98b3..834f0b548f 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -4,12 +4,8 @@
 #
 #############################################################
 
-FLEX_VERSION = 2.5.35
-FLEX_PATCH_VERSION = 10
-FLEX_SOURCE = flex_$(FLEX_VERSION).orig.tar.gz
-FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
-FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
-FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
+FLEX_VERSION = 2.5.37
+FLEX_SITE = http://download.sourceforge.net/project/flex
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING