aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltán Böszörményi <zboszor@pr.hu>2018-01-19 10:48:58 +0100
committerAlex J Lennon <ajlennon@dynamicdevices.co.uk>2018-01-24 09:45:20 +0000
commit4576ea13344f3a9f74062f0f902371ca0d5ea6b4 (patch)
treee58250a2610bc2daa3bb3a407d4348a58657036c
parent23654d99ed69f8ab46665fb6d8b33064b62c4f76 (diff)
downloadmeta-mono-4576ea13344f3a9f74062f0f902371ca0d5ea6b4.tar.gz
meta-mono-4576ea13344f3a9f74062f0f902371ca0d5ea6b4.tar.bz2
meta-mono-4576ea13344f3a9f74062f0f902371ca0d5ea6b4.zip
libgdiplus: Fix building with secure CFLAGS
libgdiplus/src/Makefile.am contains -Wno-format and this prevents enabling conf/distro/include/security_flags.inc because the new flags, especially: SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" plus libgdiplus adding its own -Wno-format flag causes a build error: cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] Removing -Wno-format from ligbdiplus allows passing the secure CFLAGS externally and such a patch was shipped by Fedora for a long time, since their libgdiplus 2.10.9 package. Signed-off-by: Zoltán Böszörményi <zboszor@pr.hu>
-rw-r--r--recipes-mono/libgdiplus/libgdiplus-4.2/libgdiplus-2.10.9-format.patch9
-rw-r--r--recipes-mono/libgdiplus/libgdiplus-native_4.2.bb1
-rw-r--r--recipes-mono/libgdiplus/libgdiplus_4.2.bb1
3 files changed, 11 insertions, 0 deletions
diff --git a/recipes-mono/libgdiplus/libgdiplus-4.2/libgdiplus-2.10.9-format.patch b/recipes-mono/libgdiplus/libgdiplus-4.2/libgdiplus-2.10.9-format.patch
new file mode 100644
index 0000000..20930ef
--- /dev/null
+++ b/recipes-mono/libgdiplus/libgdiplus-4.2/libgdiplus-2.10.9-format.patch
@@ -0,0 +1,9 @@
+diff -up libgdiplus-2.10.9/src/Makefile.am.format libgdiplus-2.10.9/src/Makefile.am
+--- libgdiplus-2.10.9/src/Makefile.am.format 2014-04-25 09:24:12.000000000 +0200
++++ libgdiplus-2.10.9/src/Makefile.am 2014-04-25 09:24:21.000000000 +0200
+@@ -119,4 +119,4 @@ libgdiplus_la_SOURCES = \
+
+ libgdiplus_la_LIBADD = $(GDIPLUS_LIBS)
+
+-INCLUDES = $(GDIPLUS_CFLAGS) -Wall -Wno-unused -Wno-format
++INCLUDES = $(GDIPLUS_CFLAGS) -Wall -Wno-unused
diff --git a/recipes-mono/libgdiplus/libgdiplus-native_4.2.bb b/recipes-mono/libgdiplus/libgdiplus-native_4.2.bb
index 4dee6a0..851d855 100644
--- a/recipes-mono/libgdiplus/libgdiplus-native_4.2.bb
+++ b/recipes-mono/libgdiplus/libgdiplus-native_4.2.bb
@@ -7,6 +7,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=fe7364dfce9f3689eb6995e7cdd56879"
SRC_URI = "https://github.com/mono/libgdiplus/archive/${PV}.tar.gz \
+ file://libgdiplus-2.10.9-format.patch \
"
inherit autotools pkgconfig native
diff --git a/recipes-mono/libgdiplus/libgdiplus_4.2.bb b/recipes-mono/libgdiplus/libgdiplus_4.2.bb
index 00eb406..9516550 100644
--- a/recipes-mono/libgdiplus/libgdiplus_4.2.bb
+++ b/recipes-mono/libgdiplus/libgdiplus_4.2.bb
@@ -14,6 +14,7 @@ PACKAGECONFIG[exif] = "--with-libexif,--without-libexif,libexif"
SRC_URI = "https://github.com/mono/libgdiplus/archive/${PV}.tar.gz \
file://01-remove-libjpeg-path.patch \
+ file://libgdiplus-2.10.9-format.patch \
"
inherit autotools pkgconfig