package/libsvgtiny: fix build with latest gperf
PATCH 1/1 package/libsvgtiny: fix build with latest gperf
Remove second patch and retrieve two upstream patches to fix build with latest gperf
Fixes:
- http://autobuild.buildroot.org/results/51be63089209d38c2cf29b0e0b08f73a0e15c467
Signed-off-by Fabrice Fontaine <[email protected]>
---
...-Werror.patch => 0002-Remove-Werror.patch} | 0
package/libsvgtiny/0002-create-builddir.patch | 15 ---
...-inlines-and-non-inlines-calling-one.patch | 36 +++++++
...nclude-gperf-generated-code-directly.patch | 97 +++++++++++++++++++
4 files changed, 133 insertions(+), 15 deletions(-)
rename package/libsvgtiny/{0003-Remove-Werror.patch => 0002-Remove-Werror.patch} (100%)
delete mode 100644 package/libsvgtiny/0002-create-builddir.patch
create mode 100644 package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch
create mode 100644 package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patchpackage/libsvgtiny/0002-Remove-Werror.patch renamed from package/libsvgtiny/0003-Remove-Werror.patch +0 -0
package/libsvgtiny/0002-create-builddir.patch deleted +0 -15
@@ -1,15 +0,0 @@ -svgtiny: create BUILDDIR before $(BUILDDIR)/src_colors.c - -Signed-off-by: Max Filippov <[email protected]> ---- ---- libsvgtiny-12121/src/Makefile.orig 2014-06-17 15:30:21.765311434 +0400 -+++ libsvgtiny-12121/src/Makefile 2014-06-17 15:29:56.569909931 +0400 -@@ -3,7 +3,7 @@ - - SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c - --$(BUILDDIR)/src_colors.c: src/colors.gperf -+$(BUILDDIR)/src_colors.c: src/colors.gperf $(BUILDDIR)/stamp - $(VQ)$(ECHO) " GPERF: $<" - $(Q)gperf [email protected] $< - # Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly)
package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 21b4836ac9d6c6725590a925daa5d17eda9843e9 Mon Sep 17 00:00:00 2001 +From: Daniel Silverstone <[email protected]> +Date: Sat, 26 Apr 2014 16:24:54 +0100 +Subject: Hopefully silence warnings about inlines and non inlines calling one + another. + +[Retrieved from: +https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=21b4836ac9d6c6725590a925daa5d17eda9843e9] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/colors.gperf | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/colors.gperf b/src/colors.gperf +index 89152d2..96d5b9e 100644 +--- a/src/colors.gperf ++++ b/src/colors.gperf +@@ -16,6 +16,15 @@ + #include <string.h> + #include "svgtiny.h" + #include "svgtiny_internal.h" ++ ++/* This unusual define shennanigan is to try and prevent the gperf ++ * generated function from being inlined. This is pointless given ++ * it (a) is in a separate .c file and (b) has external linkage. ++ */ ++#ifdef __inline ++#undef __inline ++#define __inline ++#endif + %} + + struct svgtiny_named_color; +-- +cgit v1.2.1 +
package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch new file +97 -0
97 lines not on this page · raw message
Signature · 1 line
2.23.0
Thomas Petazzoni
AppliedPATCH 1/1 package/libsvgtiny: fix build with latest gperf
Quoted 7 lines · On Mon, 14 Oct 2019 22:33:06 +0200 Fabrice Fontaine…
Remove second patch and retrieve two upstream patches to fix build with latest gperf
Fixes:
- http://autobuild.buildroot.org/results/51be63089209d38c2cf29b0e0b08f73a0e15c467Signed-off-by Fabrice Fontaine <[email protected]>
Quoted 10 lines
---
...-Werror.patch => 0002-Remove-Werror.patch} | 0
package/libsvgtiny/0002-create-builddir.patch | 15 ---
...-inlines-and-non-inlines-calling-one.patch | 36 +++++++
...nclude-gperf-generated-code-directly.patch | 97 +++++++++++++++++++
4 files changed, 133 insertions(+), 15 deletions(-)
rename package/libsvgtiny/{0003-Remove-Werror.patch => 0002-Remove-Werror.patch} (100%)
delete mode 100644 package/libsvgtiny/0002-create-builddir.patch
create mode 100644 package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch
create mode 100644 package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patchApplied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com