| 1 |
vapier 12/01/11 20:44:17 |
| 2 |
|
| 3 |
Modified: ChangeLog glib-2.30.2.ebuild glib-2.30.2-r1.ebuild |
| 4 |
Log: |
| 5 |
Assume pkgconfig exists in cross-compile setups since we need to execute `pkg-config` from ROOT=/ and not the cross-one from . |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.498 dev-libs/glib/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.498&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.498&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.497&r2=1.498 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v |
| 19 |
retrieving revision 1.497 |
| 20 |
retrieving revision 1.498 |
| 21 |
diff -u -r1.497 -r1.498 |
| 22 |
--- ChangeLog 10 Jan 2012 21:25:04 -0000 1.497 |
| 23 |
+++ ChangeLog 11 Jan 2012 20:44:17 -0000 1.498 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for dev-libs/glib |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.497 2012/01/10 21:25:04 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.498 2012/01/11 20:44:17 vapier Exp $ |
| 29 |
+ |
| 30 |
+ 11 Jan 2012; Mike Frysinger <vapier@g.o> glib-2.30.2.ebuild, |
| 31 |
+ glib-2.30.2-r1.ebuild: |
| 32 |
+ Assume pkgconfig exists in cross-compile setups since we need to execute |
| 33 |
+ `pkg-config` from ROOT=/ and not the cross-one from . |
| 34 |
|
| 35 |
*glib-2.30.2-r1 (10 Jan 2012) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.6 dev-libs/glib/glib-2.30.2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.6&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.6&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?r1=1.5&r2=1.6 |
| 45 |
|
| 46 |
Index: glib-2.30.2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v |
| 49 |
retrieving revision 1.5 |
| 50 |
retrieving revision 1.6 |
| 51 |
diff -u -r1.5 -r1.6 |
| 52 |
--- glib-2.30.2.ebuild 31 Dec 2011 21:26:59 -0000 1.5 |
| 53 |
+++ glib-2.30.2.ebuild 11 Jan 2012 20:44:17 -0000 1.6 |
| 54 |
@@ -1,12 +1,12 @@ |
| 55 |
-# Copyright 1999-2011 Gentoo Foundation |
| 56 |
+# Copyright 1999-2012 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.5 2011/12/31 21:26:59 tetromino Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.6 2012/01/11 20:44:17 vapier Exp $ |
| 60 |
|
| 61 |
EAPI="4" |
| 62 |
PYTHON_DEPEND="utils? 2" |
| 63 |
# Avoid runtime dependency on python when USE=test |
| 64 |
|
| 65 |
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx |
| 66 |
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx |
| 67 |
|
| 68 |
DESCRIPTION="The GLib library of C routines" |
| 69 |
HOMEPAGE="http://www.gtk.org/" |
| 70 |
@@ -129,8 +129,10 @@ |
| 71 |
} |
| 72 |
|
| 73 |
src_configure() { |
| 74 |
- # Avoid circular depend with dev-util/pkgconfig |
| 75 |
- if ! has_version dev-util/pkgconfig; then |
| 76 |
+ # Avoid circular depend with dev-util/pkgconfig and |
| 77 |
+ # native builds (cross-compiles won't need pkg-config |
| 78 |
+ # in the target ROOT to work here) |
| 79 |
+ if ! tc-is-cross-compiler && ! has_version dev-util/pkgconfig; then |
| 80 |
if has_version sys-apps/dbus; then |
| 81 |
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
| 82 |
export DBUS1_LIBS="-ldbus-1" |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.2 dev-libs/glib/glib-2.30.2-r1.ebuild |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?rev=1.2&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?rev=1.2&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?r1=1.1&r2=1.2 |
| 91 |
|
| 92 |
Index: glib-2.30.2-r1.ebuild |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v |
| 95 |
retrieving revision 1.1 |
| 96 |
retrieving revision 1.2 |
| 97 |
diff -u -r1.1 -r1.2 |
| 98 |
--- glib-2.30.2-r1.ebuild 10 Jan 2012 21:25:04 -0000 1.1 |
| 99 |
+++ glib-2.30.2-r1.ebuild 11 Jan 2012 20:44:17 -0000 1.2 |
| 100 |
@@ -1,12 +1,12 @@ |
| 101 |
# Copyright 1999-2012 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.1 2012/01/10 21:25:04 vapier Exp $ |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.2 2012/01/11 20:44:17 vapier Exp $ |
| 105 |
|
| 106 |
EAPI="4" |
| 107 |
PYTHON_DEPEND="utils? 2" |
| 108 |
# Avoid runtime dependency on python when USE=test |
| 109 |
|
| 110 |
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx |
| 111 |
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx |
| 112 |
|
| 113 |
DESCRIPTION="The GLib library of C routines" |
| 114 |
HOMEPAGE="http://www.gtk.org/" |
| 115 |
@@ -132,8 +132,10 @@ |
| 116 |
} |
| 117 |
|
| 118 |
src_configure() { |
| 119 |
- # Avoid circular depend with dev-util/pkgconfig |
| 120 |
- if ! has_version dev-util/pkgconfig; then |
| 121 |
+ # Avoid circular depend with dev-util/pkgconfig and |
| 122 |
+ # native builds (cross-compiles won't need pkg-config |
| 123 |
+ # in the target ROOT to work here) |
| 124 |
+ if ! tc-is-cross-compiler && ! has_version dev-util/pkgconfig; then |
| 125 |
if has_version sys-apps/dbus; then |
| 126 |
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
| 127 |
export DBUS1_LIBS="-ldbus-1" |
Archives