From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20170606143435.22835-2-clemens.gruber@pqgruber.com>
MIME-Version: 1.0
Message-Id: <E1kEF5Y-0005Uy-0D@dude02.hi.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 04 Sep 2020 19:01:24 +0200
Subject: Re: [ptxdist] [APPLIED] latrace: fix build with modern flex
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>

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