summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2012-04-18 19:18:57 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2012-04-18 19:18:57 +0000
commitb4574f298f3b34501ce6c965d1095a7a1b79fc98 (patch)
treeaaa27088f09f52d7719a9a1bbd3e993b6bb277f1 /sys-cluster/slurm
parentx86 stable, bug #409403 (diff)
downloadgentoo-2-b4574f298f3b34501ce6c965d1095a7a1b79fc98.tar.gz
gentoo-2-b4574f298f3b34501ce6c965d1095a7a1b79fc98.tar.bz2
gentoo-2-b4574f298f3b34501ce6c965d1095a7a1b79fc98.zip
[sys-cluster/slurm] Fix install in case no torque use flag set
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/slurm')
-rw-r--r--sys-cluster/slurm/ChangeLog5
-rw-r--r--sys-cluster/slurm/slurm-2.3.4.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index 4484aa0f979a..216386b21d0b 100644
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/slurm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.10 2012/04/18 13:53:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.11 2012/04/18 19:18:57 alexxy Exp $
+
+ 18 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> slurm-2.3.4.ebuild:
+ [sys-cluster/slurm] Fix install in case no torque use flag set
*slurm-2.3.4 (18 Apr 2012)
diff --git a/sys-cluster/slurm/slurm-2.3.4.ebuild b/sys-cluster/slurm/slurm-2.3.4.ebuild
index 0297c626c5a4..6689d1294e94 100644
--- a/sys-cluster/slurm/slurm-2.3.4.ebuild
+++ b/sys-cluster/slurm/slurm-2.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.3.4.ebuild,v 1.1 2012/04/18 13:53:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.3.4.ebuild,v 1.2 2012/04/18 19:18:57 alexxy Exp $
RESTRICT="primaryuri"
@@ -135,10 +135,9 @@ src_install() {
fi
if use torque; then
emake DESTDIR="${D}" -C contribs/torque || die
+ rm -f "${ED}/usr/bin/mpiexec" || die
fi
use static-libs || find "${ED}" -name '*.la' -exec rm {} +
- # we dont need it
- rm "${ED}/usr/bin/mpiexec" || die
# install sample configs
keepdir /etc/slurm
insinto /etc/slurm