From 1be95896dde41c668e1c884db704b0da2ea360c9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Apr 2014 15:21:36 +0200 Subject: [PATCH] Revert "flex: Version bump 2.5.39" The flex bump breaks at least two packages: - host-thrift, see http://autobuild.buildroot.org/results/759/7590122fd85b644ae0886a127005188d1f882bef/ - ipsec-tools, see http://autobuild.buildroot.org/results/238/238296556663d52015beb43df97106f6e164ce55/ No simple fix was found for now, so reverting is the easiest solution until some time is found to look at doing a flex bump that doesn't break those packages. This reverts commit 931d9fbae78a6bb8006a2634e9322ac253cc86f4. Signed-off-by: Thomas Petazzoni --- package/flex/flex-prog-ar.patch | 11 +++++++++++ package/flex/flex.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 package/flex/flex-prog-ar.patch diff --git a/package/flex/flex-prog-ar.patch b/package/flex/flex-prog-ar.patch new file mode 100644 index 000000000..e0626ff95 --- /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 2373d0433..17f651b80 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLEX_VERSION = 2.5.39 +FLEX_VERSION = 2.5.37 FLEX_SITE = http://download.sourceforge.net/project/flex FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX