[gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.32.1.ebuild glib-2.32.2.ebuild

[gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.32.1.ebuild glib-2.32.2.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    12/05/05 16:35:21

  Modified:             ChangeLog glib-2.32.1.ebuild glib-2.32.2.ebuild
  Log:
  Restore forgotten cross-compile fix from 2.30.x (bug #414761, thanks to Samuli Suominen).
  
  (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

Revision  Changes    Path
1.523                dev-libs/glib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.523&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.523&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.522&r2=1.523

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- ChangeLog	5 May 2012 14:11:12 -0000	1.522
+++ ChangeLog	5 May 2012 16:35:21 -0000	1.523
@@ -1,6 +1,11 @@
 # 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.522 2012/05/05 14:11:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.523 2012/05/05 16:35:21 tetromino Exp $
+
+  05 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.32.1.ebuild,
+  glib-2.32.2.ebuild:
+  Restore forgotten cross-compile fix from 2.30.x (bug #414761, thanks to
+  Samuli Suominen).
 
   05 May 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.30.2.ebuild,
   glib-2.30.3.ebuild, glib-2.32.1.ebuild, glib-2.32.2.ebuild:



1.9                  dev-libs/glib/glib-2.32.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild?r1=1.8&r2=1.9

Index: glib-2.32.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glib-2.32.1.ebuild	5 May 2012 14:11:12 -0000	1.8
+++ glib-2.32.1.ebuild	5 May 2012 16:35:21 -0000	1.9
@@ -1,12 +1,12 @@
 # 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.1.ebuild,v 1.8 2012/05/05 14:11:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.9 2012/05/05 16:35:21 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -137,8 +137,10 @@
 }
 
 src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version virtual/pkgconfig; then
+	# 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 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"



1.3                  dev-libs/glib/glib-2.32.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild?r1=1.2&r2=1.3

Index: glib-2.32.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glib-2.32.2.ebuild	5 May 2012 14:11:12 -0000	1.2
+++ glib-2.32.2.ebuild	5 May 2012 16:35:21 -0000	1.3
@@ -1,12 +1,12 @@
 # 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.2.ebuild,v 1.2 2012/05/05 14:11:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild,v 1.3 2012/05/05 16:35:21 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -130,8 +130,10 @@
 }
 
 src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version virtual/pkgconfig; then
+	# 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 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"