diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch | 63 | ||||
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb | 1 |
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 @@ | |||
1 | From 205a3b04e1216c1df199aec95185f7f48b8e0491 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 6 Oct 2015 09:11:38 +0200 | ||
4 | Subject: Run only pixbuf-lowmem test on GNU libc | ||
5 | |||
6 | The test case depends on GNU libc specific internals so we only run it | ||
7 | on GNU libc. | ||
8 | |||
9 | This fixes build on Linux with musl libc. | ||
10 | |||
11 | https://bugzilla.gnome.org/show_bug.cgi?id=756078 | ||
12 | --- | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Upstream-Status: Backport | ||
15 | |||
16 | tests/Makefile.am | 5 ----- | ||
17 | tests/pixbuf-lowmem.c | 8 ++++++++ | ||
18 | 2 files changed, 8 insertions(+), 5 deletions(-) | ||
19 | |||
20 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
21 | index 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 \ | ||
38 | diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c | ||
39 | index 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 | -- | ||
62 | cgit 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 | ||
22 | SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c" | 23 | SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c" |