aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-02-20 11:54:34 -0700
committerChristoph Junghans <ottxor@gentoo.org>2014-02-20 11:54:34 -0700
commit9bb1bb60dd4a2d3cefb8720e76f6ccf04905e992 (patch)
tree0d2b713768fd739c84df2eb4ba00a5456750d51a /sys-cluster
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-9bb1bb60dd4a2d3cefb8720e76f6ccf04905e992.tar.gz
sci-9bb1bb60dd4a2d3cefb8720e76f6ccf04905e992.tar.bz2
sci-9bb1bb60dd4a2d3cefb8720e76f6ccf04905e992.zip
fixed build, gcc doesn't understand -j1
Package-Manager: portage-2.2.7
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/charm/ChangeLog3
-rw-r--r--sys-cluster/charm/charm-6.6.0_rc2.ebuild4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 792066452..551bcb48e 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Feb 2014; Christoph Junghans <ottxor@gentoo.org> charm-6.6.0_rc2.ebuild:
+ fixed build, gcc doesn't understand -j1
+
*charm-6.6.0_rc2 (19 Feb 2014)
19 Feb 2014; Nicolas Bock <nicolasbock@gentoo.org> +charm-6.6.0_rc2.ebuild:
diff --git a/sys-cluster/charm/charm-6.6.0_rc2.ebuild b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
index 5be505e25..819fdbc74 100644
--- a/sys-cluster/charm/charm-6.6.0_rc2.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
@@ -117,8 +117,8 @@ src_prepare() {
src_compile() {
local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
local build_options="$(get_opts)"
- local build_charmc_options="${MAKEOPTS} -j1"
- local build_commandline="${build_version} ${build_options} ${build_charmc_options}"
+ #parallel build broken, just ignore MAKEOPTS
+ local build_commandline="${build_version} ${build_options}"
# Build charmm++ first.
einfo "running ./build charm++ ${build_commandline}"