| 1 |
commit: 0c3a99a4920eac32eeb2f9c920f886c48d24f302 |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Nov 22 16:41:52 2013 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Nov 22 16:41:52 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c3a99a4 |
| 7 |
|
| 8 |
sys-cluster/charm-6.6.0-rc1: Reorganized some variables. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
sys-cluster/charm/ChangeLog | 3 +++ |
| 14 |
sys-cluster/charm/charm-6.6.0_rc1.ebuild | 9 ++++++--- |
| 15 |
2 files changed, 9 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog |
| 18 |
index 9b32737..833fa07 100644 |
| 19 |
--- a/sys-cluster/charm/ChangeLog |
| 20 |
+++ b/sys-cluster/charm/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 22 Nov 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.6.0_rc1.ebuild: |
| 26 |
+ sys-cluster/charm-6.6.0-rc1: Reorganized some variables. |
| 27 |
+ |
| 28 |
20 Nov 2013; Nicolas Bock <nicolasbock@×××××.com> |
| 29 |
+files/charm-6.6.0-static-library-fix.patch, charm-6.6.0_rc1.ebuild: |
| 30 |
sys-cluster/charm-6.6.0_rc1: Rewrote patch to enable shared mode. The patch |
| 31 |
|
| 32 |
diff --git a/sys-cluster/charm/charm-6.6.0_rc1.ebuild b/sys-cluster/charm/charm-6.6.0_rc1.ebuild |
| 33 |
index 0870df5..7823e50 100644 |
| 34 |
--- a/sys-cluster/charm/charm-6.6.0_rc1.ebuild |
| 35 |
+++ b/sys-cluster/charm/charm-6.6.0_rc1.ebuild |
| 36 |
@@ -117,11 +117,14 @@ src_prepare() { |
| 37 |
} |
| 38 |
|
| 39 |
src_compile() { |
| 40 |
- local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}" |
| 41 |
+ local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')" |
| 42 |
+ local build_options="$(get_opts)" |
| 43 |
+ local build_charmc_options="${MAKEOPTS} -j1" |
| 44 |
+ local build_commandline="${build_version} ${build_options} ${build_charmc_options}" |
| 45 |
|
| 46 |
# Build charmm++ first. |
| 47 |
- einfo "running ./build charm++ ${mybuildoptions}" |
| 48 |
- ./build charm++ ${mybuildoptions} || die "Failed to build charm++" |
| 49 |
+ einfo "running ./build charm++ ${build_commandline}" |
| 50 |
+ ./build charm++ ${build_commandline} || die "Failed to build charm++" |
| 51 |
|
| 52 |
# make pdf/html docs |
| 53 |
if use doc; then |
Archives