[ptxdist] [PATCH 1/2] flex: version bump 2.5.39 -> 2.6.4

[ptxdist] [PATCH 1/2] flex: version bump 2.5.39 -> 2.6.4

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/flex.make | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rules/flex.make b/rules/flex.make
index 803e25897..26be4caa5 100644
--- a/rules/flex.make
+++ b/rules/flex.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_FLEX) += flex
 #
 # Paths and names
 #
-FLEX_VERSION	:= 2.5.39
-FLEX_MD5	:= 477679c37ff8b28248a9b05f1da29a82
+FLEX_VERSION	:= 2.6.4
+FLEX_MD5	:= 2882e3179748cc9f9c23ec593d6adc8d
 FLEX		:= flex-$(FLEX_VERSION)
-FLEX_SUFFIX	:= tar.xz
-FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
+FLEX_SUFFIX	:= tar.gz
+FLEX_URL	:= https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/$(FLEX).$(FLEX_SUFFIX)
 FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
 FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
 FLEX_LICENSE	:= BSD-2-Clause
@@ -36,7 +36,10 @@ FLEX_CONF_TOOL	:= autoconf
 FLEX_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-nls \
-	--disable-rpath
+	--disable-rpath \
+	--disable-warnings \
+	--enable-libfl \
+	--disable-bootstrap
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] latrace: fix build with modern flex

[Clemens Gruber]

Building latrace with the current stable version of GNU flex was broken.
Patch the scanner configuration to fix it.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0003-Fix-scanner-config-for-flex-2.6.x.patch   | 30 ++++++++++++++++++++++
 patches/latrace-0.5.11/series                      |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch

diff --git a/patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch b/patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch
new file mode 100644
index 000000000..6d7f2e3f9
--- /dev/null
+++ b/patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch
@@ -0,0 +1,30 @@
+From: Clemens Gruber <clemens.gruber@pqgruber.com>
+Date: Tue, 6 Jun 2017 16:10:51 +0200
+Subject: [PATCH] Fix scanner config for flex 2.6.x
+
+Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
+---
+ src/config-flex.l | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/config-flex.l b/src/config-flex.l
+index 433992f26c34..dd59614da6d3 100644
+--- a/src/config-flex.l
++++ b/src/config-flex.l
+@@ -108,15 +108,13 @@ OPTIONS				{ BEGIN(options); return OPTIONS; }
+ 
+ %%
+ 
+-#ifndef yywrap
+-int yywrap()
++int lt_config_wrap()
+ {
+ 	return 1;
+ 	/* XXX not to get the compiler 'not used' warning */
+ 	yyunput(0, NULL);
+ 	input();
+ }
+-#endif
+ 
+ void lt_config_error(const char *m)
+ {
diff --git a/patches/latrace-0.5.11/series b/patches/latrace-0.5.11/series
index b3d7039ce..e5fca867e 100644
--- a/patches/latrace-0.5.11/series
+++ b/patches/latrace-0.5.11/series
@@ -2,4 +2,5 @@
 #tag:base --start-number 1
 0001-Buildsystem-fix-configure-creation.patch
 0002-Buildsystem-fix-cross-compilation.patch
-# 2fce77713402030eb4733818ed9fa789  - git-ptx-patches magic
+0003-Fix-scanner-config-for-flex-2.6.x.patch
+# 4d5dd32b0e94ea16d76445cc06c509e6  - git-ptx-patches magic
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [APPLIED] flex: version bump 2.5.39 -> 2.6.4

[Michael Olbrich]

Thanks, applied as a45be6acdd7beab6fbd2ed1235a4775853ad18f8.

Michael

[sent from post-receive hook]

On Fri, 04 Sep 2020 19:01:23 +0200, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> Message-Id: <20170606143435.22835-1-clemens.gruber@pqgruber.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/flex.make b/rules/flex.make
> index 06ddd9f1c808..1cb89ff31c81 100644
> --- a/rules/flex.make
> +++ b/rules/flex.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_FLEX) += flex
>  #
>  # Paths and names
>  #
> -FLEX_VERSION	:= 2.5.39
> -FLEX_MD5	:= 477679c37ff8b28248a9b05f1da29a82
> +FLEX_VERSION	:= 2.6.4
> +FLEX_MD5	:= 2882e3179748cc9f9c23ec593d6adc8d
>  FLEX		:= flex-$(FLEX_VERSION)
> -FLEX_SUFFIX	:= tar.xz
> -FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
> +FLEX_SUFFIX	:= tar.gz
> +FLEX_URL	:= https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/$(FLEX).$(FLEX_SUFFIX)
>  FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
>  FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
>  FLEX_LICENSE	:= BSD-2-Clause
> @@ -34,7 +34,10 @@ FLEX_CONF_TOOL	:= autoconf
>  FLEX_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-nls \
> -	--disable-rpath
> +	--disable-rpath \
> +	--disable-warnings \
> +	--enable-libfl \
> +	--disable-bootstrap
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] latrace: fix build with modern flex

[Michael Olbrich]

Thanks, applied as f2c79f4c6d4d64d8a23776ef64b2f2a8f1b4c710.

Michael

[sent from post-receive hook]

On Fri, 04 Sep 2020 19:01:23 +0200, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> Building latrace with the current stable version of GNU flex was broken.
> Patch the scanner configuration to fix it.
> 
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> Message-Id: <20170606143435.22835-2-clemens.gruber@pqgruber.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch b/patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch
> new file mode 100644
> index 000000000000..6d7f2e3f9546
> --- /dev/null
> +++ b/patches/latrace-0.5.11/0003-Fix-scanner-config-for-flex-2.6.x.patch
> @@ -0,0 +1,30 @@
> +From: Clemens Gruber <clemens.gruber@pqgruber.com>
> +Date: Tue, 6 Jun 2017 16:10:51 +0200
> +Subject: [PATCH] Fix scanner config for flex 2.6.x
> +
> +Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> +---
> + src/config-flex.l | 4 +---
> + 1 file changed, 1 insertion(+), 3 deletions(-)
> +
> +diff --git a/src/config-flex.l b/src/config-flex.l
> +index 433992f26c34..dd59614da6d3 100644
> +--- a/src/config-flex.l
> ++++ b/src/config-flex.l
> +@@ -108,15 +108,13 @@ OPTIONS				{ BEGIN(options); return OPTIONS; }
> + 
> + %%
> + 
> +-#ifndef yywrap
> +-int yywrap()
> ++int lt_config_wrap()
> + {
> + 	return 1;
> + 	/* XXX not to get the compiler 'not used' warning */
> + 	yyunput(0, NULL);
> + 	input();
> + }
> +-#endif
> + 
> + void lt_config_error(const char *m)
> + {
> diff --git a/patches/latrace-0.5.11/series b/patches/latrace-0.5.11/series
> index b3d7039cefeb..e5fca867e395 100644
> --- a/patches/latrace-0.5.11/series
> +++ b/patches/latrace-0.5.11/series
> @@ -2,4 +2,5 @@
>  #tag:base --start-number 1
>  0001-Buildsystem-fix-configure-creation.patch
>  0002-Buildsystem-fix-cross-compilation.patch
> -# 2fce77713402030eb4733818ed9fa789  - git-ptx-patches magic
> +0003-Fix-scanner-config-for-flex-2.6.x.patch
> +# 4d5dd32b0e94ea16d76445cc06c509e6  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de