From 88bbe89564d5e47b565bc1b0d2823ab9808e9247 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 11 Jan 2012 20:44:17 +0000 Subject: [PATCH] Assume pkgconfig exists in cross-compile setups since we need to execute `pkg-config` from ROOT=/ and not the cross-one from . Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- dev-libs/glib/ChangeLog | 7 ++++++- dev-libs/glib/Manifest | 32 ++++++++++++++--------------- dev-libs/glib/glib-2.30.2-r1.ebuild | 10 +++++---- dev-libs/glib/glib-2.30.2.ebuild | 12 ++++++----- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index a6a61a1c564f..11c15b6a6b44 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -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.497 2012/01/10 21:25:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.498 2012/01/11 20:44:17 vapier Exp $ + + 11 Jan 2012; Mike Frysinger glib-2.30.2.ebuild, + glib-2.30.2-r1.ebuild: + Assume pkgconfig exists in cross-compile setups since we need to execute + `pkg-config` from ROOT=/ and not the cross-one from . *glib-2.30.2-r1 (10 Jan 2012) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index ccda6c54a122..0e208cfa857c 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -27,24 +27,24 @@ DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36 EBUILD glib-2.28.8.ebuild 7404 RMD160 df5a5f4ee06e7620b6b75a43ea6764e20626b022 SHA1 7a1418dbd1df2b8a6a511e781532a19ebdef6b63 SHA256 e21a8482d3ece513afb5620df8838f25e4b5adbd2c7e6d006e864e755d69d702 EBUILD glib-2.30.1-r2.ebuild 8495 RMD160 af0d12e4d79adb1ce31bbdca515de5fbb04fd714 SHA1 a2105fef9ab37b35fdd90fcdee8b6fa80fcfc71d SHA256 31374346b2d69d74980edda42b75c136bf9c5a157cf55bb8b25485a5224c4382 -EBUILD glib-2.30.2-r1.ebuild 8608 RMD160 3ccc8e29d45cb96aa6855eb652f5d34e028cfbea SHA1 700e201e0162366de5951a86ffe37fbbaf9ba4c6 SHA256 f6a58f21cb000c2bf5fc4b42090e7e6f091859e249ba38151c676a888935b795 -EBUILD glib-2.30.2.ebuild 8504 RMD160 7996e900feb09f2860edae98e9b5ec3e11335cae SHA1 638f88102c1e66b72fa60750e67cb528af4fe04f SHA256 3f8ace46fc8b58975c911c5b79c66d61a6e5f3305ea837a474fab3fd59c4b9c7 -MISC ChangeLog 66602 RMD160 999dffe1df9625cabb4665664bd7fc6501a3d885 SHA1 e88d28a35d1a17678eff9efcd0b21ca6299d486a SHA256 fc804cb45b368f516f43bb138dd4b21df997e8e1b722ca565c4530c49c25531a +EBUILD glib-2.30.2-r1.ebuild 8745 RMD160 476a298a1978c2476edefa5d5e7ae8c0f36246f0 SHA1 ae8d71c0d519b4fa26723dbb5a29def0c8e87cc8 SHA256 23dab9af9ab36a2f46a3b8adb6d9a6deb4bd9eeedd968af4400b1f6fd29669ff +EBUILD glib-2.30.2.ebuild 8638 RMD160 4bdf91ed1ea69a501a445e6054dbfec32e42e9c4 SHA1 de54a68f9602ab8191405457a936ae5b82b57f35 SHA256 33bc15d0e30c04a55357018a55118f5e62d9f9c30fae3dbd19392743446a4e3e +MISC ChangeLog 66829 RMD160 b7c7cf589f9a547f4c2ae54d93fa9e59e0cbf789 SHA1 5a52357ac862b679d93941a9656f4beb95d26ad4 SHA256 fb5905502420c6ccaf4f4bd390f2a50ba19887efe1c51c712fbeb7ead30419e1 MISC metadata.xml 497 RMD160 447ae0d07ac529dbe1830e383d2ef4eae7359ea7 SHA1 4cb36fafa32d53a0dbeec978b0d75f4e7acb3fa0 SHA256 a1840f7e6af57edc9fe5b54deae9e2083858d27792fda3f4e1e8e04624b17d0d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPDKy4AAoJELEHsLL7fEFWXycQALQ3P2OYI0jzK/nAaWHWUJN7 -5mIHnEU4iNYqGaGLcr7CkccgUvnjvRBQzE6SQmHHFXqrAngkbNpGLpHK9eR4rp0a -AKqvZmpd2ZrYpfVlGo3uRE8XyZ2atAC+1qqzMoAzjpGxtvBhrUZpTt50kAE+TRaE -UsqMeCYRj72MGdjYopJDME8ywRgfqodZtZbFCRqfM3G0uHWuGikEJj4xJMX4mpzJ -lK5y3TcNDHvgyHpAd3++zZxAheRO4S3nP1+xJr+ttHg2dUU8bn7AGO8Ga4bWLLfn -CCk+nOqmVtjPDjn8XPQU+Hgq1QuYPuWR0bOIsfU6O3rBbx8Gm+9cXTXfFllPHrqF -LaPsrmQKcd0hplug7mnwKljLAFV/Jw6s64MgTNaSvZlAMSgms7jtQ8XjJWxbt3xe -1Vc42TasPsDFY74/ET03SI7fAwNpztVDUnxtb6pBbmLSiBGxK+ICO0BNFen8HVUl -It2kuApA1bWmcoMtTtZDYNl4kI0rmrqYJ8PrAd6WqqYad6zO1xNMDY6mBCP/oqal -Es1HhdSupIMqCM2dBtDQLMpuhvgQMcFzvktIqwObl7H6GqrynqPTGt+yqkAn3PqM -wopq7eog7MkzWy/QxCWuqGfQnmJWZs68HsETA5d0dpX1lKQeo2kVUHw63ECgCPGA -K2YPzLBUwXoh4RbBuYht -=hZdD +iQIcBAEBAgAGBQJPDfSqAAoJELEHsLL7fEFW0f8QAJcl0r8Fpu1UZw09cxadK4UJ +i7mBGBjh6N3oSP1vIZ3t/nkdzBRXxH6NPoJxf4f8a0Q0v2T4+vJwUWeKInmc5qTT +7VV0JBwT9652KMinH00YDvnNn+xbYjMFTGMMGwxeD+Yo7+JwirzHB/NU4lwWahku +3OhjYQJTlHDROero7Rss/YFzeYS9dqT+BrszftLI2vWwgrNp9FfDyo6QNFfQ37Ub +S8pNiRwvNRXILTdfwF9pzqjOQbZcANPu0hRqcAPB4YSUR7LVJbVN/8zFKvWDAMhK +tuQsfedOp6GEP2IleqXQFwKigbJWQuFsA+eVrikfsq0FrKikuPkzeWFKI5wyJ5KV +q88SfbtrJCxa8baIkpWdFffDv4s/2J+D2DDUb89mbhBkpqGyI1CgewSYiAL0NUME +q1qAZ5hFEnU9T+TkZb9RoesermaATaBRMcMfNZiZun2yEaa/d50mrI9gjKTZ6ueG +VSNDMWt/fIyd7LqJT2kXKe8zW6LqB2gJ/Msf9RwoCrytApCDYjgMQH6xNm73M6lB +MmkKa2+KS9Cpo7vi4YgJwLUKq8UUfuIV8G1aHVjn7D1aOgT/BTcl+OPM4Db0LB/o +tfasSC1pBAHbSgcCwcIDdlbfAAQu5RFsfilSmrcTEpLaEvjYvpbLb5vW5gwVKz2v +fJIvOxHrZZlnms3tgjdI +=P7G4 -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.30.2-r1.ebuild b/dev-libs/glib/glib-2.30.2-r1.ebuild index f70765eb20b1..0971af126752 100644 --- a/dev-libs/glib/glib-2.30.2-r1.ebuild +++ b/dev-libs/glib/glib-2.30.2-r1.ebuild @@ -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.30.2-r1.ebuild,v 1.1 2012/01/10 21:25:04 vapier Exp $ +# $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 $ EAPI="4" PYTHON_DEPEND="utils? 2" # Avoid runtime dependency on python when USE=test -inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx +inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" @@ -132,8 +132,10 @@ src_prepare() { } src_configure() { - # Avoid circular depend with dev-util/pkgconfig - if ! has_version dev-util/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 dev-util/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" diff --git a/dev-libs/glib/glib-2.30.2.ebuild b/dev-libs/glib/glib-2.30.2.ebuild index dba2984f1894..b0832289156a 100644 --- a/dev-libs/glib/glib-2.30.2.ebuild +++ b/dev-libs/glib/glib-2.30.2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.30.2.ebuild,v 1.5 2011/12/31 21:26:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.6 2012/01/11 20:44:17 vapier Exp $ EAPI="4" PYTHON_DEPEND="utils? 2" # Avoid runtime dependency on python when USE=test -inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx +inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" @@ -129,8 +129,10 @@ src_prepare() { } src_configure() { - # Avoid circular depend with dev-util/pkgconfig - if ! has_version dev-util/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 dev-util/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" -- 2.26.2