From: Samuli Suominen Date: Tue, 23 Feb 2010 09:07:59 +0000 (+0000) Subject: Fix parallel make wrt #293607, thanks to Wolfram Schlich for reporting. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=475e28582c53ddbadec38af059a5eaf90692d915;p=gentoo.git Fix parallel make wrt #293607, thanks to Wolfram Schlich for reporting. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- diff --git a/dev-libs/eggdbus/ChangeLog b/dev-libs/eggdbus/ChangeLog index f6882cbd07b6..7bec89583587 100644 --- a/dev-libs/eggdbus/ChangeLog +++ b/dev-libs/eggdbus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/eggdbus # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/eggdbus/ChangeLog,v 1.8 2010/02/16 17:21:49 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/eggdbus/ChangeLog,v 1.9 2010/02/23 09:07:59 ssuominen Exp $ + + 23 Feb 2010; Samuli Suominen eggdbus-0.6.ebuild: + Fix parallel make wrt #293607, thanks to Wolfram Schlich for reporting. 16 Feb 2010; Joseph Jezak eggdbus-0.6.ebuild: Marked ~ppc64 for bug #296548. diff --git a/dev-libs/eggdbus/Manifest b/dev-libs/eggdbus/Manifest index da28a4a68dfe..fd4dce34a42a 100644 --- a/dev-libs/eggdbus/Manifest +++ b/dev-libs/eggdbus/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX eggdbus-0.4-ldflags.patch 331 RMD160 f2a478146049ae56d2841c06a25fc3d2704393c8 SHA1 38ae2b08ce4ebd7fe138fdb0130a4f94a7d6d595 SHA256 15f03331919220910003f4f8f442046d22db4b44a9b4af21d738207c8a13edf2 AUX eggdbus-0.4-tests.patch 1482 RMD160 6382097bcace50926a7393b3062747b438017f7b SHA1 6c00f9167f08e5b26f1e825ed8f2162cf86e6d84 SHA256 210147809b91f161567b2784d27e6040ef1b0b3087ed178c8e0e5991acafea88 AUX eggdbus-0.5-leakfix.patch 640 RMD160 c5954b5379f71c32e5cbc23f141533054b8b61c9 SHA1 b3a961b4458640770a2fa88d2558a4ec86c9c06f SHA256 2cc9faf2442633421d89b1279df1cb7c3f2e29cc461e3c52b25cd813d86c40cd @@ -9,13 +6,6 @@ DIST eggdbus-0.5.tar.gz 790432 RMD160 792f684e7254dc8ba82717d1bf0c5b2f299e1573 S DIST eggdbus-0.6.tar.gz 801596 RMD160 73bffd34c9289b0715d1442f425b6803af9baa7d SHA1 d84b64773fef10516ea641f1e0913a2cf3991b05 SHA256 045b1904c90a5acb2ddc93504cdbc5e1317c8021bbf919cea3bf18a686911085 EBUILD eggdbus-0.4.ebuild 1353 RMD160 116ee9c058efb9cb1846c3d4942ddda650909181 SHA1 b265a561c831e2f1199100bb6d06102e7c81cd9a SHA256 af58bce6cafd34fef358af31475852e15b3a47a5acb1770db674fadf3a30a56e EBUILD eggdbus-0.5.ebuild 1408 RMD160 5ec6fb328f9b6547cb85b726eaa49beaa1723338 SHA1 efe64801ef823469556fa5b7357ccbfa8be8d793 SHA256 b23a29b0855545b359af108b737d9ad41a0bd540659d1e9f322d09fee8db99df -EBUILD eggdbus-0.6.ebuild 1395 RMD160 ecb2e806bc3bd7ba41a551611fdfc571aa67c865 SHA1 5791ec2b8b993a7ac438415d2282b5f249040a9d SHA256 f546117cbeeff4b0fb02a828af6e9c22f8534e08cc92e6da5b78579db145c515 -MISC ChangeLog 1372 RMD160 8b27a825bf89a3788941a51aa5e7b66fcad81708 SHA1 12a7173321040d0bb2fe4b1e6f3d28e59e1863be SHA256 be686ec34862ee421f2500ca6e09c399cdc2547b67c26cadf0df1a31262db404 +EBUILD eggdbus-0.6.ebuild 1433 RMD160 1b8c19532ebe88b83d05b77d45a207392215ab29 SHA1 08e78bab8cf1d43170b3e109a5094413cd46f12a SHA256 f5cb2b0aa055b928491b031c0bb7ebea581b48afc6e47ee9adca0fa87a7edeaf +MISC ChangeLog 1524 RMD160 a46c1b9e2fa4951c2815dde003962558dcd7b648 SHA1 90d88fdceaf76494084fec5f93e0ad5e91ea450a SHA256 d9690c08864a87e01895839b76d776e15de18d5c2b0aba99530895dc42a1a507 MISC metadata.xml 332 RMD160 dd877edb91eab31e5c18086cf14a41b52bb73707 SHA1 35c79f5ecf5b2db080dd17024423268b716174c4 SHA256 f0cdca5e67328c01c0ed1fcfd81020bd8a9969cf78bc9a140d9392ea553d14a9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkt60/MACgkQcsIHjyDViGRaqQCeNru38zKuEX3wFdHSVJtUeZSx -XX8AoLjPOYJHCDrl2YYUMT+oelvwlb1M -=qGsA ------END PGP SIGNATURE----- diff --git a/dev-libs/eggdbus/eggdbus-0.6.ebuild b/dev-libs/eggdbus/eggdbus-0.6.ebuild index 043b66ebd6ec..a319ec11e58a 100644 --- a/dev-libs/eggdbus/eggdbus-0.6.ebuild +++ b/dev-libs/eggdbus/eggdbus-0.6.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/eggdbus/eggdbus-0.6.ebuild,v 1.4 2010/02/16 17:21:49 josejx Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/dev-libs/eggdbus/eggdbus-0.6.ebuild,v 1.5 2010/02/23 09:07:59 ssuominen Exp $ +EAPI=2 inherit autotools eutils DESCRIPTION="D-Bus bindings for GObject" @@ -28,8 +27,8 @@ DEPEND="${DEPEND} # man pages are built (and installed) when doc is enabled src_prepare() { - epatch "${FILESDIR}"/${PN}-0.4-ldflags.patch - epatch "${FILESDIR}"/${PN}-0.4-tests.patch + epatch "${FILESDIR}"/${PN}-0.4-ldflags.patch \ + "${FILESDIR}"/${PN}-0.4-tests.patch eautoreconf } @@ -49,8 +48,12 @@ src_configure() { $(use_enable test tests) } -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" +src_compile() { + emake -C src/eggdbus eggdbusenumtypes.h || die + emake || die +} - dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed" +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog HACKING NEWS README || die }