From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH 2/2] latrace: fix build with modern flex
Date: Tue, 6 Jun 2017 16:34:35 +0200 [thread overview]
Message-ID: <20170606143435.22835-2-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20170606143435.22835-1-clemens.gruber@pqgruber.com>
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
next prev parent reply other threads:[~2017-06-06 14:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 14:34 [ptxdist] [PATCH 1/2] flex: version bump 2.5.39 -> 2.6.4 Clemens Gruber
2017-06-06 14:34 ` Clemens Gruber [this message]
2020-09-04 17:01 ` [ptxdist] [APPLIED] latrace: fix build with modern flex Michael Olbrich
2020-09-04 17:01 ` [ptxdist] [APPLIED] flex: version bump 2.5.39 -> 2.6.4 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170606143435.22835-2-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox