summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-07 18:12:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-07 18:12:41 +0000
commitbc8aa62bc6c5f9d0d4b0fe677abc07cd1bfcf751 (patch)
tree79d393a818b22d802778683c882968b049a19be6 /dev-libs/glib
parentInitial import. Ebuild written by Ian Delaney <johneed@hotmail.com>. Fixes bu... (diff)
downloadgentoo-2-bc8aa62bc6c5f9d0d4b0fe677abc07cd1bfcf751.tar.gz
gentoo-2-bc8aa62bc6c5f9d0d4b0fe677abc07cd1bfcf751.tar.bz2
gentoo-2-bc8aa62bc6c5f9d0d4b0fe677abc07cd1bfcf751.zip
Check if pkg-config binary is working instead of checking if virtual/pkgconfig is installed.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog6
-rw-r--r--dev-libs/glib/glib-2.32.3.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 3cb0c2375779..8bd38cfb17c4 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.526 2012/05/24 13:36:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.527 2012/06/07 18:12:41 ssuominen Exp $
+
+ 07 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.32.3.ebuild:
+ Check if pkg-config binary is working instead of checking if
+ virtual/pkgconfig is installed.
24 May 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.30.3.ebuild:
ppc stable wrt #410611
diff --git a/dev-libs/glib/glib-2.32.3.ebuild b/dev-libs/glib/glib-2.32.3.ebuild
index a3cb5549d0dd..8c9dc236f586 100644
--- a/dev-libs/glib/glib-2.32.3.ebuild
+++ b/dev-libs/glib/glib-2.32.3.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.3.ebuild,v 1.1 2012/05/15 06:22:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.3.ebuild,v 1.2 2012/06/07 18:12:41 ssuominen Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
@@ -130,7 +130,7 @@ src_configure() {
# Avoid circular depend with dev-util/pkgconfig and
# native builds (cross-compiles won't need pkg-config
# in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! has_version virtual/pkgconfig; then
+ if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
if has_version sys-apps/dbus; then
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
export DBUS1_LIBS="-ldbus-1"