From 69c0dd02dd77d45035c7458bbb3507bfd659bc47 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 7 Nov 2020 10:39:25 +0100
Subject: 20201107.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 .../fix-scanner-config-for-flex-2.6.x.patch        | 23 ++++++++++++++++++++++
 development/latrace/latrace.SlackBuild             |  3 +++
 2 files changed, 26 insertions(+)
 create mode 100644 development/latrace/fix-scanner-config-for-flex-2.6.x.patch

(limited to 'development/latrace')

diff --git a/development/latrace/fix-scanner-config-for-flex-2.6.x.patch b/development/latrace/fix-scanner-config-for-flex-2.6.x.patch
new file mode 100644
index 0000000000..301f4c5a96
--- /dev/null
+++ b/development/latrace/fix-scanner-config-for-flex-2.6.x.patch
@@ -0,0 +1,23 @@
+--- src/config-flex.l.orig	2011-07-25 07:18:18.000000000 -0400
++++ src/config-flex.l	2017-07-02 13:52:20.048382500 -0400
+@@ -106,19 +106,17 @@ OPTIONS				{ BEGIN(options); return OPTI
+ <options>"\n"		{ NEW_LINE(); }
+ <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)
+ {
+ 	printf("conf file [%s] line %d: %s\n",
+ 		lt_inc_stack(lt_config_sinc)->file,
diff --git a/development/latrace/latrace.SlackBuild b/development/latrace/latrace.SlackBuild
index 899601c4e5..bf2208d214 100644
--- a/development/latrace/latrace.SlackBuild
+++ b/development/latrace/latrace.SlackBuild
@@ -54,6 +54,9 @@ find -L . \
   -type d -exec chmod 0755 {} \; -o \
   -type f -exec chmod u+rw,go+r-w,a-s {} \;
 
+# Thanks archlinux!
+patch -p0 < $CWD/fix-scanner-config-for-flex-2.6.x.patch
+
 autoconf
 
 CFLAGS="$SLKCFLAGS" \
-- 
cgit v1.2.3