diff options
| author |   Marcelo Góes <vanquirius@gentoo.org> | 2005-05-16 02:13:18 +0000 |
|---|---|---|
| committer | Marcelo Góes <vanquirius@gentoo.org> | 2005-05-16 02:13:18 +0000 |
| commit | 5d7934ae844fee06e342f210b4593c94ca3d7195 (patch) | |
| tree | 126fc4b8bfa42e7027a9f9c87e5ca5ebad6ac41c /app-benchmarks | |
| parent | Remove unused inherit gcc for bug #92745 (diff) | |
| download | gentoo-2-5d7934ae844fee06e342f210b4593c94ca3d7195.tar.gz gentoo-2-5d7934ae844fee06e342f210b4593c94ca3d7195.tar.bz2 gentoo-2-5d7934ae844fee06e342f210b4593c94ca3d7195.zip | |
bug 92745, file collision
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-benchmarks')
| -rw-r--r-- | app-benchmarks/lmbench/ChangeLog | 6 | ||||
| -rw-r--r-- | app-benchmarks/lmbench/Manifest | 6 | ||||
| -rw-r--r-- | app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild | 9 |
3 files changed, 14 insertions, 7 deletions
diff --git a/app-benchmarks/lmbench/ChangeLog b/app-benchmarks/lmbench/ChangeLog index e0c418b5ae74..6a4c0c9be6df 100644 --- a/app-benchmarks/lmbench/ChangeLog +++ b/app-benchmarks/lmbench/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-benchmarks/lmbench # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/ChangeLog,v 1.10 2005/04/21 17:51:32 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/ChangeLog,v 1.11 2005/05/16 02:13:18 vanquirius Exp $ + + 15 May 2005; Marcelo Goes <vanquirius@gentoo.org> lmbench-3.0_alpha3.ebuild: + Use toolchain-funcs.eclass instead of gcc.eclass for bug 92745. Also, avoiding + file collision with /usr/bin/line and sys-apps/util-linux. 21 Apr 2005; Simon Stelling <blubb@gentoo.org> lmbench-3.0_alpha3.ebuild: stable on amd64 diff --git a/app-benchmarks/lmbench/Manifest b/app-benchmarks/lmbench/Manifest index cccac866c305..543c2a78f875 100644 --- a/app-benchmarks/lmbench/Manifest +++ b/app-benchmarks/lmbench/Manifest @@ -1,6 +1,6 @@ +MD5 139e39efe64adae2bd630968d6649e78 lmbench-3.0_alpha3.ebuild 1422 MD5 16f7273eb7a24efc45dbf74f677e02ea ChangeLog 1121 -MD5 e85f8e727f492b9252d67de6aaacee6e lmbench-3.0_alpha3.ebuild 1313 MD5 1067597d6549e1545b84a9d379901ae4 metadata.xml 412 -MD5 1cddbfe67828e96db956b8b6535f44c0 files/bc-config 646 -MD5 25a33fad490151f7d1e8522b7795da7f files/bc_lm.pl 3196 MD5 79c7cffe8649099fd090204cd546db39 files/digest-lmbench-3.0_alpha3 64 +MD5 25a33fad490151f7d1e8522b7795da7f files/bc_lm.pl 3196 +MD5 1cddbfe67828e96db956b8b6535f44c0 files/bc-config 646 diff --git a/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild b/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild index a22d48a59ed9..33eb2ac8e32e 100644 --- a/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild +++ b/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild,v 1.11 2005/04/21 17:51:32 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild,v 1.12 2005/05/16 02:13:18 vanquirius Exp $ -inherit gcc +inherit toolchain-funcs MY_P=${P/_alpha/-a} DESCRIPTION="Suite of simple, portable benchmarks" @@ -23,7 +23,7 @@ src_compile() { -e 's#^@files =#chdir "/usr/share/lmbench"; @files =#' \ -e "s#../../CONFIG#/etc/bc-config#g" ${FILESDIR}/bc_lm.pl > bc_lm.pl - emake CC=$(gcc-getCC) MAKE=make OS=`scripts/os` build || die + emake CC=$(tc-getCC) MAKE=make OS=`scripts/os` build || die } src_install() { @@ -48,4 +48,7 @@ src_install() { chmod 777 ${D}/usr/share/lmbench/results dodir /usr/share/lmbench/bin chmod 777 ${D}/usr/share/lmbench/bin + + # avoid file collision with sys-apps/util-linux + mv ${D}/usr/bin/line ${D}/usr/bin/line.lmbench } |