commit: 0cde5cef33c8cae17a2c4f96ffecc8d47422cea1 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Fri Feb 26 12:36:18 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Feb 26 12:36:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde5cef
x11-libs/gdk-pixbuf: fix build on uClibc, bug #563052 Upstream doesn't understand the proper use of __GLIBC__ and __UCLIBC__, which I am trying to convince them of. See: https://bugzilla.gnome.org/show_bug.cgi?id=756590 Package-Manager: portage-2.2.26 .../gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch | 34 ++++++++++++++++++++++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild | 3 ++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild | 3 ++ 3 files changed, 40 insertions(+) diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch new file mode 100644 index 0000000..77ea7e7 --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch @@ -0,0 +1,34 @@ +From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" <[email protected]> +Date: Wed, 14 Oct 2015 16:18:19 -0400 +Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on + uClibc + +pixbuf-lowmem.c depends on GNU libc internals and does not build +on musl or uClibc. Commit e1fd25a fixes this issue for musl by +testing if __GLIBC__ is set. However, uClibc sets __GLIBC__ and +so this check is insufficient there. We expand the check so that +we run pixbuf-lowmem on glibc, while avoiding it on both musl and +uClibc. + +Signed-off-by: Anthony G. Basile <[email protected]> +--- + tests/pixbuf-lowmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c +index 9e9571f..ec7504f 100644 +--- a/tests/pixbuf-lowmem.c ++++ b/tests/pixbuf-lowmem.c +@@ -24,7 +24,7 @@ + #include <time.h> + #include <string.h> + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + #define PRETEND_MEM_SIZE (16 * 1024 * 1024) + #define REMAINING_MEM_SIZE 100000 + +-- +2.4.9 + diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild index a8fa239..5ca298a 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild @@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { + # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 + epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch + # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild index 27a8968..b7f6597 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild @@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { + # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 + epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch + # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068
