commit: c778cd26d8a593a538e76d6693beed3ec5fd5eb2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Apr 9 15:44:31 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Apr 9 15:44:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c778cd26
sci-geosciences/geocode-glib: fix build on uclibc, bug #577290 Package-Manager: portage-2.2.26 .../geocode-glib-3.18.1-fix-GLIBC-features.patch | 54 ++++++++++++++++++++++ .../geocode-glib/geocode-glib-3.18.1.ebuild | 6 ++- .../geocode-glib/geocode-glib-3.18.2.ebuild | 6 ++- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch b/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch new file mode 100644 index 0000000..23b1443 --- /dev/null +++ b/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch @@ -0,0 +1,54 @@ +From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" <[email protected]> +Date: Tue, 22 Mar 2016 09:48:00 +0000 +Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features + +Commit f0f85d8d introduces __GLIBC__ to check for glibc only features. +However this is not sufficient for uClibc because it shares code with +glibc. To select for features in glibc but not uClibc, we need +defined(__GLIBC__) && !defined(__UCLIBC__). + +https://bugzilla.gnome.org/show_bug.cgi?id=764021 +--- + geocode-glib/geocode-glib.c | 4 ++-- + geocode-glib/test-gcglib.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/geocode-glib/geocode-glib.c b/geocode-glib/geocode-glib.c +index 4e3b3fd..6215fd1 100644 +--- a/geocode-glib/geocode-glib.c ++++ b/geocode-glib/geocode-glib.c +@@ -213,7 +213,7 @@ _geocode_object_get_lang (void) + return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL)); + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + static gpointer + is_number_after_street (gpointer data) + { +@@ -246,7 +246,7 @@ is_number_after_street (gpointer data) + gboolean + _geocode_object_is_number_after_street (void) + { +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) || defined(__UCLIBC__) + return FALSE; + #else + static GOnce once = G_ONCE_INIT; +diff --git a/geocode-glib/test-gcglib.c b/geocode-glib/test-gcglib.c +index a23a3c3..9d7194d 100644 +--- a/geocode-glib/test-gcglib.c ++++ b/geocode-glib/test-gcglib.c +@@ -395,7 +395,7 @@ test_distance (void) + static void + test_locale_format (void) + { +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + GeocodeForward *object; + GError *error = NULL; + GList *res; +-- +2.7.3 + diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild index abb0b02..504779d 100644 --- a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild +++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,6 +38,10 @@ DEPEND="${RDEPEND} # need various locales to be present RESTRICT="test" +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-GLIBC-features.patch +} + src_test() { export GVFS_DISABLE_FUSE=1 export GIO_USE_VFS=gvfs diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild index a2a5922..09dcadc 100644 --- a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild +++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,6 +38,10 @@ DEPEND="${RDEPEND} # need various locales to be present RESTRICT="test" +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.18.1-fix-GLIBC-features.patch +} + src_configure() { gnome2_src_configure $(use_enable introspection) }
