From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 14/17] gdk-pixbuf: Fix latent build issue exposed by musl
Date: Sat, 19 Dec 2015 23:52:23 +0000 [thread overview]
Message-ID: <8bed4520e44b25b99e69ccb4752a98c326679f7e.1450568936.git.raj.khem@gmail.com> (raw)
In-Reply-To: <81170e1970685f34735007c496ce175279d46304.1450568936.git.raj.khem@gmail.com>
In-Reply-To: <cover.1450568936.git.raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch | 25 ++++++++++++++++++++++
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb | 1 +
2 files changed, 26 insertions(+)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
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 0000000..706debf
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
@@ -0,0 +1,25 @@
+__libc_malloc and family of functions are in glibc but not in musl e.g. so mark them as such
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gdk-pixbuf-2.32.1/tests/pixbuf-lowmem.c
+===================================================================
+--- gdk-pixbuf-2.32.1.orig/tests/pixbuf-lowmem.c
++++ gdk-pixbuf-2.32.1/tests/pixbuf-lowmem.c
+@@ -33,9 +33,15 @@ static int max_allocation = PRETEND_MEM_
+
+ #define HEADER_SPACE sizeof(gsize)
+
++#ifdef __GLIBC__
+ extern void *__libc_malloc (size_t size);
+ extern void *__libc_realloc (void *mem, size_t size);
+ extern void *__libc_free (void *mem);
++#else
++#define __libc_malloc malloc
++#define __libc_realloc realloc
++#define __libc_free free
++#endif
+
+ static gpointer
+ record_bytes (gpointer mem, gsize bytes)
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 084fe36..104c743 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 \
file://extending-libinstall-dependencies.patch \
file://run-ptest \
file://fatal-loader.patch \
+ file://libc_memfuncs.patch \
"
SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c"
--
2.6.4
next prev parent reply other threads:[~2015-12-19 23:52 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-19 23:52 [PATCH 00/17] musl fixes phase 2 Khem Raj
2015-12-19 23:52 ` [PATCH 01/17] powertop: Include right headers for timval struct Khem Raj
2015-12-21 12:11 ` Burton, Ross
2015-12-19 23:52 ` [PATCH 02/17] dhcp: Include sys/types.h for u_int* defs Khem Raj
2015-12-21 12:11 ` Burton, Ross
2015-12-19 23:52 ` [PATCH 03/17] blktrace: Include <sys/types.h for dev_t Khem Raj
2015-12-21 12:12 ` Burton, Ross
2015-12-19 23:52 ` [PATCH 04/17] ppp: Fix build with musl Khem Raj
2015-12-19 23:52 ` [PATCH 05/17] tcp-wrappers: " Khem Raj
2015-12-19 23:52 ` [PATCH 06/17] tcmode-default: Use glibc for nativesdk version even on uclibc and musl Khem Raj
2015-12-19 23:52 ` [PATCH 07/17] libtirpc: Fix build for musl Khem Raj
2015-12-29 1:17 ` Khem Raj
2015-12-19 23:52 ` [PATCH 08/17] fts: Add recipe Khem Raj
2015-12-21 12:15 ` Burton, Ross
2015-12-21 13:42 ` Khem Raj
2015-12-25 5:53 ` Khem Raj
2015-12-19 23:52 ` [PATCH 09/17] valgrind: Define __UCLIBC__ for uclibc based systems Khem Raj
2015-12-21 20:38 ` Andre McCurdy
2015-12-21 20:57 ` Andre McCurdy
2015-12-19 23:52 ` [PATCH 10/17] connman: include config.h for HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR Khem Raj
2016-01-08 10:08 ` Burton, Ross
2015-12-19 23:52 ` [PATCH 11/17] libcgroup: Add dependency on fts when building on musl Khem Raj
2015-12-19 23:52 ` [PATCH 12/17] linux-libc-headers: Port patches for linux-headers for musl Khem Raj
2015-12-19 23:52 ` [PATCH 13/17] xserver-xorg: Fix build with musl Khem Raj
2016-01-08 10:10 ` Burton, Ross
2016-01-08 10:23 ` Khem Raj
2015-12-19 23:52 ` Khem Raj [this message]
2015-12-19 23:52 ` [PATCH 15/17] argp-standalone: Add recipe Khem Raj
2015-12-19 23:52 ` [PATCH 16/17] gnutls: Link with libargp on musl and depend on argp-standalone Khem Raj
2015-12-19 23:52 ` [PATCH 17/17] util-linux: Fix ptest builds on musl Khem Raj
2016-01-07 15:32 ` [PATCH 00/17] musl fixes phase 2 Burton, Ross
2016-01-07 16:48 ` Khem Raj
2016-01-08 9:40 ` Khem Raj
2016-01-08 9:58 ` Burton, Ross
2016-01-08 10:24 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8bed4520e44b25b99e69ccb4752a98c326679f7e.1450568936.git.raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox