From 6973e434ab009050efb3954bd4d4dab6d24b6c9b Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Wed, 18 Apr 2007 21:04:21 +0000 Subject: [PATCH] Specify toolchain compiler. Do not build perl or ruby bindings if respective USE flag is disabled, even if perl or ruby is installed on the system. Force -j1 to make, since the build system is weird and tends to break with multiple parallel jobs. Package-Manager: portage-2.1.2.3 --- dev-libs/stfl/ChangeLog | 8 +++++++- dev-libs/stfl/Manifest | 22 +++++++++++----------- dev-libs/stfl/stfl-0.8.ebuild | 17 ++++++++++++----- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog index ab622c743318..e6ab1662dffd 100644 --- a/dev-libs/stfl/ChangeLog +++ b/dev-libs/stfl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/stfl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.1 2007/04/18 05:45:35 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.2 2007/04/18 21:04:21 ticho Exp $ + + 18 Apr 2007; Andrej Kacian stfl-0.8.ebuild: + Specify toolchain compiler. Do not build perl or ruby bindings if respective + USE flag is disabled, even if perl or ruby is installed on the system. Force + -j1 to make, since the build system is weird and tends to break with + multiple parallel jobs. *stfl-0.8 (17 Apr 2007) diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest index d6e0418d4dd6..01707e25fcfd 100644 --- a/dev-libs/stfl/Manifest +++ b/dev-libs/stfl/Manifest @@ -2,14 +2,14 @@ Hash: SHA1 DIST stfl-0.8.tar.gz 28313 RMD160 6895f6ec21ebbb8b9c0eb75e66791c1d58b78711 SHA1 c6874626b3fdd9aba5adaf3c2feddd925dd5a119 SHA256 7c922fdc59c180b278dc9ef5dc76d6900cc6489d5a70a7f6b4275cae9a6afa1c -EBUILD stfl-0.8.ebuild 1407 RMD160 63620b9ced71cf238b6cfa515086d048f8c0c462 SHA1 a0bbb5d52b2db4391cb88475cd9aba459b287d66 SHA256 239b5d5db738f47ac806289a90759d86b665ab9c3c7c02c535d3de7ef593bac5 -MD5 62976f5810f148869779ed1965d4b511 stfl-0.8.ebuild 1407 -RMD160 63620b9ced71cf238b6cfa515086d048f8c0c462 stfl-0.8.ebuild 1407 -SHA256 239b5d5db738f47ac806289a90759d86b665ab9c3c7c02c535d3de7ef593bac5 stfl-0.8.ebuild 1407 -MISC ChangeLog 417 RMD160 861642365f61d3e0a2337232517dc89f5d060297 SHA1 0f401853cb3f08ca4694fc6703e886b0fba58c7c SHA256 5f7ed4ef976502c57f0c8af95c14316e98254d7af13f73afc1a1692738b03b83 -MD5 e83e759c5dc125bb87675981587ec73f ChangeLog 417 -RMD160 861642365f61d3e0a2337232517dc89f5d060297 ChangeLog 417 -SHA256 5f7ed4ef976502c57f0c8af95c14316e98254d7af13f73afc1a1692738b03b83 ChangeLog 417 +EBUILD stfl-0.8.ebuild 1570 RMD160 b354037f828bce15ea82d194919b03c08e4cbc6e SHA1 7ac76b09903f6f47a7fda516de659a4edf5528d2 SHA256 561d7a3d9e2ae721b74eec82c52a214d711b48add95dfd5470a40f48c6a9a80a +MD5 8e0f3dbf2690caf16abd6c3f2f0a1d1c stfl-0.8.ebuild 1570 +RMD160 b354037f828bce15ea82d194919b03c08e4cbc6e stfl-0.8.ebuild 1570 +SHA256 561d7a3d9e2ae721b74eec82c52a214d711b48add95dfd5470a40f48c6a9a80a stfl-0.8.ebuild 1570 +MISC ChangeLog 738 RMD160 f953f8983286a827aba7d806af97cbd2affb6eff SHA1 3cb57dde41b900c5bdb6cface68ffe0a1a21e699 SHA256 6c5dbafe148f15c928c3ba4f4e8de663f19daaf809ed78b0789b1bfdc198d6d5 +MD5 e40356d400481a59c87d27a3fa09082a ChangeLog 738 +RMD160 f953f8983286a827aba7d806af97cbd2affb6eff ChangeLog 738 +SHA256 6c5dbafe148f15c928c3ba4f4e8de663f19daaf809ed78b0789b1bfdc198d6d5 ChangeLog 738 MISC metadata.xml 854 RMD160 29ac50626abeccbd3103efddaf1133a90aedef95 SHA1 0ee1c61aea66ff23397ddfd85a3e6b16042fa5e9 SHA256 0cf06fb2f96477ecde9a853c16e188ba48e090c938660db1640eb6b83140046a MD5 273e53ed1cdad4efc75b154144904ecd metadata.xml 854 RMD160 29ac50626abeccbd3103efddaf1133a90aedef95 metadata.xml 854 @@ -20,7 +20,7 @@ SHA256 22b3870a14124f951b981cedc176b44bb3eee643f430a2f23bd86368f5e0db98 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGJbCFQlM6RnzZP+IRAmgvAKCKTlTHQyohxJZeQn83DpTZodsggQCeIdP+ -lSuStAl5A/CpsBpnZ6w07+Q= -=BNaa +iD8DBQFGJofbQlM6RnzZP+IRAlTuAJ9hHNbXrWmzg0OrEY2NrjnFlbIV4wCeMXIM +TYBcJPpeec414yithA6birk= +=aiqC -----END PGP SIGNATURE----- diff --git a/dev-libs/stfl/stfl-0.8.ebuild b/dev-libs/stfl/stfl-0.8.ebuild index f9a3402751dd..3a064831fd99 100644 --- a/dev-libs/stfl/stfl-0.8.ebuild +++ b/dev-libs/stfl/stfl-0.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.8.ebuild,v 1.1 2007/04/18 05:45:35 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.8.ebuild,v 1.2 2007/04/18 21:04:21 ticho Exp $ -inherit perl-module +inherit perl-module toolchain-funcs DESCRIPTION="A library which implements a curses-based widget set for text terminals" HOMEPAGE="http://www.clifford.at/stfl/" @@ -26,16 +26,23 @@ src_unpack() { unpack "${A}" cd "${S}" sed -i \ - -e 's!-O0 -ggdb!!' \ - -e 's!^all:.*!all: libstfl.a!' \ + -e "s!-O0 -ggdb!!" \ + -e "s!^all:.*!all: libstfl.a!" \ Makefile sed -i -e "s:/usr/lib/python2.4:${D}/usr/lib/python2.4:" \ python/Makefile.snippet + + if ! use perl; then + echo "FOUND_PERL5=0" >>Makefile.cfg + fi + if ! use ruby; then + echo "FOUND_RUBY=0" >>Makefile.cfg + fi } src_compile() { - emake || die "make failed" + emake -j1 CC="$(tc-getCC)" || die "make failed" } src_install() { -- 2.26.2