summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-17 07:38:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:26 +0000
commita7d780c1bc3383514d0a2c04661203eede59b82d (patch)
treee50107c4233905bdbdac60ec418612c9d952e097 /meta
parentf2cf5d33982e8f805690615047de971031d02543 (diff)
downloadpoky-a7d780c1bc3383514d0a2c04661203eede59b82d.tar.gz
gdk-pixbuf: Fix latent build issue exposed by musl
(From OE-Core rev: f02a8228db795f2c6c8d81cfd7e0b88bf355c1b8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch63
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb1
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
new file mode 100644
index 0000000000..82a27c3ac4
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
@@ -0,0 +1,63 @@
1From 205a3b04e1216c1df199aec95185f7f48b8e0491 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Tue, 6 Oct 2015 09:11:38 +0200
4Subject: Run only pixbuf-lowmem test on GNU libc
5
6The test case depends on GNU libc specific internals so we only run it
7on GNU libc.
8
9This fixes build on Linux with musl libc.
10
11https://bugzilla.gnome.org/show_bug.cgi?id=756078
12---
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Upstream-Status: Backport
15
16 tests/Makefile.am | 5 -----
17 tests/pixbuf-lowmem.c | 8 ++++++++
18 2 files changed, 8 insertions(+), 5 deletions(-)
19
20diff --git a/tests/Makefile.am b/tests/Makefile.am
21index bdd68f3..c122188 100644
22--- a/tests/Makefile.am
23+++ b/tests/Makefile.am
24@@ -19,13 +19,8 @@ LDADD = \
25 noinst_PROGRAMS += \
26 pixbuf-read \
27 pixbuf-random \
28- $(NULL)
29-
30-if OS_LINUX
31-noinst_PROGRAMS += \
32 pixbuf-lowmem \
33 $(NULL)
34-endif
35
36 test_programs = \
37 animation \
38diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
39index ae71788..9e9571f 100644
40--- a/tests/pixbuf-lowmem.c
41+++ b/tests/pixbuf-lowmem.c
42@@ -24,6 +24,7 @@
43 #include <time.h>
44 #include <string.h>
45
46+#ifdef __GLIBC__
47 #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
48 #define REMAINING_MEM_SIZE 100000
49
50@@ -225,3 +226,10 @@ main (int argc, char **argv)
51
52 return 0;
53 }
54+#else
55+int
56+main (int argc, char **argv)
57+{
58+ return 0;
59+}
60+#endif
61--
62cgit v0.11.2
63
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
index 084fe3613e..104c743914 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
17 file://extending-libinstall-dependencies.patch \ 17 file://extending-libinstall-dependencies.patch \
18 file://run-ptest \ 18 file://run-ptest \
19 file://fatal-loader.patch \ 19 file://fatal-loader.patch \
20 file://libc_memfuncs.patch \
20 " 21 "
21 22
22SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c" 23SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c"