summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/glib/ChangeLog6
-rw-r--r--dev-libs/glib/glib-2.32.4.ebuild6
2 files changed, 10 insertions, 2 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 9967da00ec52..3a6093c22119 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.531 2012/09/11 18:03:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.532 2012/09/12 04:53:41 tetromino Exp $
+
+ 12 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.32.4.ebuild:
+ Add AS_IF patches from 2.33.x to fix cross-compiling; bug #434770, thanks to
+ Mike Frysinger.
11 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.30.2.ebuild,
glib-2.30.3.ebuild, glib-2.32.3.ebuild, glib-2.32.4.ebuild:
diff --git a/dev-libs/glib/glib-2.32.4.ebuild b/dev-libs/glib/glib-2.32.4.ebuild
index 569c9ee8d8af..06b9b89ca186 100644
--- a/dev-libs/glib/glib-2.32.4.ebuild
+++ b/dev-libs/glib/glib-2.32.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4.ebuild,v 1.3 2012/09/11 18:03:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4.ebuild,v 1.4 2012/09/12 04:53:41 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
@@ -11,6 +11,7 @@ inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pa
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="${SRC_URI}
+ http://dev.gentoo.org/~tetromino/distfiles/glib/${P}-AS_IF-patches.tar.xz
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2"
@@ -107,6 +108,9 @@ src_prepare() {
# bashcomp goes in /usr/share/bash-completion
epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+ # AS_IF fixes from 2.33.x, needed for cross-compiling, bug #434770
+ epatch ../AS_IF-patches/*.patch
+
# disable pyc compiling
use test && python_clean_py-compile_files