flex: bump version to 2.6.4
- 0001 patch removed. It doesn't apply on this version and is also not
necessary since the AR binary is now handled correctly with AR = @AR@.
- 0002 patch removed. It's already included in this release:
a5cbe929ac
- The flex project has moved to GitHub, so modify the URLs in both
flex.mk and Config.in files.
- The sed command over Makefile.in to prevent the flex binary to be
built fails, so remove it. That logic has been moved to
src/Makefile.in, and whenever we disable the flex binary to be built
then the compilation fails when building the documentation because
some bits require "../src/flex", which is the flex binary.
We prevent building the flex binary and the documentation using a new
patch.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
9235a19f1a
commit
e9a5f5843d
|
@ -0,0 +1,35 @@
|
|||
flex: prevent flex binary to be built
|
||||
|
||||
Since we prevent the flex binary to be built, we also need to prevent
|
||||
the documentation to be built, otherwise it will fail like this:
|
||||
|
||||
Making all in doc
|
||||
make[2]: Entering directory '/br/output/build/flex-2.6.4/doc'
|
||||
make[2]: *** No rule to make target '../src/flex', needed by 'flex.1'.
|
||||
Stop.
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
|
||||
diff -rup a/Makefile.in b/Makefile.in
|
||||
--- a/Makefile.in 2017-05-06 15:49:09.000000000 +0100
|
||||
+++ b/Makefile.in 2017-05-10 14:35:20.152794902 +0100
|
||||
@@ -450,7 +450,6 @@ EXTRA_DIST = \
|
||||
|
||||
SUBDIRS = \
|
||||
src \
|
||||
- doc \
|
||||
examples \
|
||||
po \
|
||||
tests \
|
||||
diff -rup a/src/Makefile.in b/src/Makefile.in
|
||||
--- a/src/Makefile.in 2017-05-06 15:49:09.000000000 +0100
|
||||
+++ b/src/Makefile.in 2017-05-10 14:35:01.918464036 +0100
|
||||
@@ -90,7 +90,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
-bin_PROGRAMS = flex$(EXEEXT)
|
||||
+bin_PROGRAMS =
|
||||
@ENABLE_BOOTSTRAP_TRUE@noinst_PROGRAMS = stage1flex$(EXEEXT)
|
||||
@CROSS_TRUE@am__append_1 = \
|
||||
@CROSS_TRUE@ ../lib/malloc.c \
|
|
@ -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 =
|
|
@ -1,25 +0,0 @@
|
|||
From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001
|
||||
From: Will Estes <westes575@gmail.com>
|
||||
Date: Sat, 27 Feb 2016 11:56:05 -0500
|
||||
Subject: [PATCH] Fixed incorrect integer type
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Status: upstream
|
||||
|
||||
flex.skl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/flex.skl b/src/flex.skl
|
||||
index 36a526a..64f853d 100644
|
||||
--- a/flex.skl
|
||||
+++ b/flex.skl
|
||||
@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer()
|
||||
|
||||
else
|
||||
{
|
||||
- yy_size_t num_to_read =
|
||||
+ int num_to_read =
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
|
||||
|
||||
while ( num_to_read <= 0 )
|
|
@ -5,4 +5,4 @@ config BR2_PACKAGE_FLEX
|
|||
A fast lexical analyser generator. A tool for generating
|
||||
programs that perform pattern-matching on text.
|
||||
|
||||
http://flex.sourceforge.net/
|
||||
https://github.com/westes/flex/
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# Locally computed:
|
||||
sha256 bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3 flex-2.5.37.tar.gz
|
||||
sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
FLEX_VERSION = 2.5.37
|
||||
FLEX_SITE = http://download.sourceforge.net/project/flex
|
||||
FLEX_VERSION = 2.6.4
|
||||
FLEX_SITE = https://github.com/westes/flex/files/981163
|
||||
FLEX_INSTALL_STAGING = YES
|
||||
FLEX_LICENSE = FLEX
|
||||
FLEX_LICENSE_FILES = COPYING
|
||||
|
@ -15,11 +15,6 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
|
|||
# we don't have a host-gettext/libintl
|
||||
HOST_FLEX_DEPENDENCIES = host-m4
|
||||
|
||||
define FLEX_DISABLE_PROGRAM
|
||||
$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
|
||||
endef
|
||||
FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
|
||||
|
||||
# flex++ symlink is broken when flex binary is not installed
|
||||
define FLEX_REMOVE_BROKEN_SYMLINK
|
||||
rm -f $(TARGET_DIR)/usr/bin/flex++
|
||||
|
|
Loading…
Reference in a new issue