From 91d126c7e33bf7383ef7bcced0ee555d868ba511 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 7 Oct 2011 15:03:15 +0000 Subject: [PATCH] Move parallel make blocking to global space, #358567 & #356671 Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64 --- dev-util/fhist/ChangeLog | 6 +++++- dev-util/fhist/Manifest | 16 ++++++++-------- dev-util/fhist/fhist-1.16.ebuild | 21 ++++++++++++--------- dev-util/fhist/fhist-1.19.ebuild | 15 ++++----------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dev-util/fhist/ChangeLog b/dev-util/fhist/ChangeLog index eb35eee93992..470480b094ac 100644 --- a/dev-util/fhist/ChangeLog +++ b/dev-util/fhist/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/fhist # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/ChangeLog,v 1.26 2011/09/25 12:35:42 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/ChangeLog,v 1.27 2011/10/07 15:03:15 jlec Exp $ + + 07 Oct 2011; Justin Lecher fhist-1.16.ebuild, + fhist-1.19.ebuild: + Move parallel make blocking to global space, #358567 & #356671 25 Sep 2011; Fabian Groffen fhist-1.19.ebuild: Drop *-macos keywords, libexplain is a too Linux-specific hell to port (1.16 diff --git a/dev-util/fhist/Manifest b/dev-util/fhist/Manifest index 389467744e1a..2e302a25b882 100644 --- a/dev-util/fhist/Manifest +++ b/dev-util/fhist/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 1.19-ldflags.patch 1742 RMD160 d2f575a98c69df1275f7bbeace5237f999e33011 SHA1 319ee00bc843a7504b5cfb1b12fa74383fc6b0cb SHA256 53bfc6a7b03e52314398bd8a0a60fcfbe66457edc1381f163b168c77d37c1a11 DIST fhist-1.16.tar.gz 383180 RMD160 234ae94aeb9638453ac6ba4aebbe66b3af36f24a SHA1 e8d4f353240bde8afd48862d9b225c410e47c11e SHA256 3f71c86939694755e456a9c82156f779063e74240d21da2251f33ae3c25ea336 DIST fhist-1.19.tar.gz 409083 RMD160 302accebcb0ce91ea04b73047fe3d274699e7157 SHA1 6cfbdb9c5e5cfa1a057453420c71eea6731f1818 SHA256 e18d97f6ff5c44593f82775eb82540d870409ed80712eead8fd41684f194f62c -EBUILD fhist-1.16.ebuild 949 RMD160 bb84e5e56558c6a39bf1ee48f3b8de422f1c8337 SHA1 624e96a2567ac368c4cdd0933e7d365d7d8fdccd SHA256 9f72349fb5c0c8413c36f84d7ef16547543e7fbd728dc1c7fd7aa0214d61c6bb -EBUILD fhist-1.19.ebuild 770 RMD160 e416991fe7e4df0ae6b345af45eeca77e976be8b SHA1 eadcce03646807656df6445993f9447b4f278059 SHA256 1cc41ed283ab7738488a6702e7a234ed0ef60d4c241373190f6a0884c0de3f69 -MISC ChangeLog 3676 RMD160 610722059a9581ad24d301f33dcbab3dc19d48e4 SHA1 88cafc2f81401ac25cefc71bbd72ed18fe63125e SHA256 4dab9e10120363fd33e0d4bb17c8720c9ea33798388b18b8b087a9290b207786 +EBUILD fhist-1.16.ebuild 943 RMD160 0fe5691af5c8e0d45d36299dab856168fc127d93 SHA1 7a305b13240a4f1c138f4d60915037d01dd2138d SHA256 a9f9c0fd7f3d24086e87098c0c490cac9508c5a8485960899f3c7ac85b080f92 +EBUILD fhist-1.19.ebuild 685 RMD160 83a6bc00a429fb47d6465a8a975f8f63750c05df SHA1 e6f99b06fb226206cd7a7eb7b3c9b393f510534e SHA256 badb943359a14552b27a34cd0ef1962cc4785b9aa0bcb2c0853d60c24ab09b4e +MISC ChangeLog 3826 RMD160 c2cf793c27d0f1a9c5628e562a6cf76c8f582a63 SHA1 19b340fbc909520a3c6f602ae5c62e86c800ee75 SHA256 9a789be4f0080acd8db428f073bdc296967ee4d1e3d185169c2fc74ccdcf2c2d MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (Darwin) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5/ICQACgkQX3X2B8XHTolhfACfchIR6s+XqT20Lm5wTFhBR8KY -Wc0An29XVIog/7dupYAgKZwLf0IJOVkQ -=utKV +iEYEAREKAAYFAk6PFLkACgkQgAnW8HDreRaVHACgy0b50vBpFp89RsTzfq/tIHbU +MM4AoK/6760giWhyW4GBEQppmPit+mGf +=tcnW -----END PGP SIGNATURE----- diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild index 5adc5a46970f..f455891a79b9 100644 --- a/dev-util/fhist/fhist-1.16.ebuild +++ b/dev-util/fhist/fhist-1.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.16.ebuild,v 1.5 2011/06/12 20:04:44 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.16.ebuild,v 1.6 2011/10/07 15:03:15 jlec Exp $ DESCRIPTION="File history and comparison tools" HOMEPAGE="http://fhist.sourceforge.net/fhist.html" @@ -17,25 +17,28 @@ DEPEND="${RDEPEND} test? ( app-arch/sharutils ) sys-devel/bison" +MAKEOPTS+=" -j1" + src_compile() { - econf || die "econf failed" - # bug #295744 - emake -j1 || die "emake failed" + econf + emake || die "emake failed" } src_test() { - emake -j1 sure || die "src_test failed" + emake sure || die "src_test failed" } src_install () { - emake -j1 RPM_BUILD_ROOT="${D}" NLSDIR="${D}/usr/share/locale" \ + emake \ + RPM_BUILD_ROOT="${D}" \ + NLSDIR="${D}/usr/share/locale" \ install || die "make install failed" - dodoc lib/en/*.txt - dodoc lib/en/*.ps + dodoc lib/en/*.txt || die + dodoc lib/en/*.ps || die # remove duplicate docs etc. rm -r "${D}"/usr/share/fhist - dodoc MANIFEST README + dodoc MANIFEST README || die } diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild index 4f884b773a03..6a971fb35328 100644 --- a/dev-util/fhist/fhist-1.19.ebuild +++ b/dev-util/fhist/fhist-1.19.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.19.ebuild,v 1.5 2011/09/25 12:35:42 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.19.ebuild,v 1.6 2011/10/07 15:03:15 jlec Exp $ -EAPI="4" +EAPI=4 inherit eutils @@ -23,15 +23,8 @@ DEPEND="${RDEPEND} sys-devel/bison test? ( app-arch/sharutils )" +MAKEOPTS+=" -j1" + src_prepare() { epatch "${FILESDIR}"/${PV}-ldflags.patch } - -src_compile() { - emake -j1 -} - -src_install () { - emake -j1 DESTDIR="${D}" install - dodoc README -} -- 2.26.2