rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bsp/buildroot/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch Normal file
View File

@@ -0,0 +1,35 @@
From ffa886a580929f26fd5e5a40c9c5334955c48553 Mon Sep 17 00:00:00 2001
From: Explorer09 <explorer09@gmail.com>
Date: Mon, 4 Sep 2017 10:47:33 +0800
Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac.
This would, e.g. define _GNU_SOURCE in config.h, enabling the
reallocarray() prototype in glibc 2.26+ on Linux systems with that
version of glibc.
Fixes #241.
Backported from: 24fd0551333e7eded87b64dd36062da3df2f6380
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
configure.ac | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index 55e774b..c879fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,10 @@
# autoconf requirements and initialization
AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex])
+AC_PREREQ([2.60])
AC_CONFIG_SRCDIR([src/scan.l])
AC_CONFIG_AUX_DIR([build-aux])
+AC_USE_SYSTEM_EXTENSIONS
LT_INIT
AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects])
AC_CONFIG_HEADER([src/config.h])
--
2.14.1

11
bsp/buildroot/package/flex/0001-prog-ar.patch
View File

@@ -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 =

76
bsp/buildroot/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch Normal file
View File

@@ -0,0 +1,76 @@
From da21733178b34eea303964db5a05e8a3ee4095b4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 26 Aug 2017 15:17:06 +0200
Subject: [PATCH] build: make it possible to disable the build of the flex
program
The flex program uses fork(), which isn't available on noMMU
systems. However, the libfl library does not use fork(), and be used
by other programs/libraries.
Therefore, it makes sense to provide an option to disable the build of
the flex program.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
Submitted-upstream: https://github.com/westes/flex/pull/256
Refused. We'll have to adapt when they do a new release...
---
Makefile.am | 2 ++
configure.ac | 6 ++++++
doc/Makefile.am | 4 ++++
src/Makefile.am | 3 +++
4 files changed, 15 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index e790e9d..8b57bc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,8 +62,10 @@ ChangeLog: $(srcdir)/tools/git2cl
indent:
cd src && $(MAKE) $(AM_MAKEFLAGS) indent
+if ENABLE_PROGRAM
install-exec-hook:
cd $(DESTDIR)$(bindir) && \
$(LN_S) -f flex$(EXEEXT) flex++$(EXEEXT)
+endif
.PHONY: ChangeLog indent
diff --git a/configure.ac b/configure.ac
index 8882016..f49872b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,12 @@ AC_ARG_ENABLE([libfl],
[], [enable_libfl=yes])
AM_CONDITIONAL([ENABLE_LIBFL], [test "x$enable_libfl" = xyes])
+AC_ARG_ENABLE([program],
+ [AS_HELP_STRING([--disable-program],
+ [do not build the flex program, only the libfl library])],
+ [], [enable_program=yes])
+AM_CONDITIONAL([ENABLE_PROGRAM], [test "x$enable_program" = xyes])
+
# --disable-bootstrap is intended only to workaround problems with bootstrap
# (e.g. when cross-compiling flex or when bootstrapping has bugs).
# Ideally we should be able to bootstrap even when cross-compiling.
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d13a5a..c73bc17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,10 @@ LIBS = @LIBS@
m4 = @M4@
+if ENABLE_PROGRAM
bin_PROGRAMS = flex
+endif
+
if ENABLE_BOOTSTRAP
noinst_PROGRAMS = stage1flex
endif
--
2.9.4

25
bsp/buildroot/package/flex/0002-fix-CVE-2016-6354.patch
View File

@@ -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 )

58
bsp/buildroot/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch Normal file
View File

@@ -0,0 +1,58 @@
From b89b8475a5b2f9444c32f7d254b35968da3c8a23 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 29 Sep 2017 18:03:51 +0200
Subject: [PATCH] build: make it possible to disable the build of the
documentation
When targetting embedded evices, the documentation is not needed.
Building the documentation default to whether the program is built.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile.am | 8 +++++++-
configure.ac | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index fce30b2..ee75b64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,15 @@ EXTRA_DIST = \
.indent.pro \
autogen.sh
+MAYBE_SUBDIRS =
+
+if ENABLE_DOC
+MAYBE_SUBDIRS += doc
+endif
+
SUBDIRS = \
src \
- doc \
+ $(MAYBE_SUBDIRS) \
examples \
po \
tests \
diff --git a/configure.ac b/configure.ac
index c54e98f..b3ae450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,12 @@ AC_ARG_ENABLE([program],
[], [enable_program=yes])
AM_CONDITIONAL([ENABLE_PROGRAM], [test "x$enable_program" = xyes])
+AC_ARG_ENABLE([doc],
+ [AS_HELP_STRING([--disable-doc],
+ [do not build the documentation])],
+ [], [enable_doc=${enable_program}])
+AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = xyes -a "x$enable_program" = xyes])
+
# --disable-bootstrap is intended only to workaround problems with bootstrap
# (e.g. when cross-compiling flex or when bootstrapping has bugs).
# Ideally we should be able to bootstrap even when cross-compiling.
--
2.11.0

5
bsp/buildroot/package/flex/Config.in
View File

@@ -1,8 +1,9 @@
config BR2_PACKAGE_FLEX
bool "flex"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
A fast lexical analyser generator. A tool for generating
programs that perform pattern-matching on text.
http://flex.sourceforge.net/
Only the library is available.
https://github.com/westes/flex/

4
bsp/buildroot/package/flex/flex.hash
View File

@@ -1,2 +1,4 @@
# Locally computed:
sha256 bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3 flex-2.5.37.tar.gz
sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz
# License files, locally calculated
sha256 97fd685958d93be7f8dab939bb8161dbd6afb0718c63bfc337c24321aea44273 COPYING

31
bsp/buildroot/package/flex/flex.mk
View File

@@ -4,27 +4,28 @@
#
################################################################################
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
FLEX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
# we don't have a host-gettext/libintl
FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4
HOST_FLEX_DEPENDENCIES = host-m4
define FLEX_DISABLE_PROGRAM
$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
endef
FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
# 0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
# 0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
# 0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
FLEX_AUTORECONF = YES
FLEX_GETTEXTIZE = YES
FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 \
ac_cv_func_reallocarray=no
# flex++ symlink is broken when flex binary is not installed
define FLEX_REMOVE_BROKEN_SYMLINK
rm -f $(TARGET_DIR)/usr/bin/flex++
endef
FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
# Don't enable programs, they are not needed on the target, and
# require MMU support.
# Don't enable the doc, it's not needed on the target and requires
# special tools (help2man) to build.
FLEX_CONF_OPTS += --disable-program --disable-doc
HOST_FLEX_CONF_OPTS = --disable-doc
$(eval $(autotools-package))
$(eval $(host-autotools-package))