diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-08-15 01:24:37 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-08-15 01:24:37 +0000 |
| commit | 41be8010c5d8098f78a78355b94072ffd8a9dc2c (patch) | |
| tree | 0158ca54da88c9bd8d1f3ed805c6f20e8a105c06 /dev-libs/glib/glib-2.36.3-r2.ebuild | |
| parent | Automated update. (diff) | |
| download | historical-41be8010c5d8098f78a78355b94072ffd8a9dc2c.tar.gz historical-41be8010c5d8098f78a78355b94072ffd8a9dc2c.tar.bz2 historical-41be8010c5d8098f78a78355b94072ffd8a9dc2c.zip | |
Restore the pkg.m4 hack from 2.34.x to prevent stage3 build failure (bug #481056, thanks to Markos Chandras).
Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'dev-libs/glib/glib-2.36.3-r2.ebuild')
| -rw-r--r-- | dev-libs/glib/glib-2.36.3-r2.ebuild | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dev-libs/glib/glib-2.36.3-r2.ebuild b/dev-libs/glib/glib-2.36.3-r2.ebuild index 0b0ed4cfd51c..6ad7d7010610 100644 --- a/dev-libs/glib/glib-2.36.3-r2.ebuild +++ b/dev-libs/glib/glib-2.36.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.4 2013/08/14 04:19:30 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.5 2013/08/15 01:24:32 tetromino Exp $ EAPI="5" PYTHON_COMPAT=( python2_{5,6,7} ) @@ -10,6 +10,8 @@ inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} + http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf LICENSE="LGPL-2+" SLOT="2" @@ -74,6 +76,9 @@ pkg_setup() { } src_prepare() { + # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 + mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die + # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch |