1 |
commit: 6b909bf77399f06a8c71b07134a1aee44672c679 |
2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri May 31 04:33:31 2013 +0000 |
4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
5 |
CommitDate: Fri May 31 04:33:31 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6b909bf7 |
7 |
|
8 |
Added src_test(). |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha177 |
11 |
|
12 |
--- |
13 |
sys-cluster/charm/ChangeLog | 3 +++ |
14 |
sys-cluster/charm/charm-6.5.0.ebuild | 13 ++++++++----- |
15 |
2 files changed, 11 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog |
18 |
index d09a18b..2a37b6c 100644 |
19 |
--- a/sys-cluster/charm/ChangeLog |
20 |
+++ b/sys-cluster/charm/ChangeLog |
21 |
@@ -3,6 +3,9 @@ |
22 |
# $Header: $ |
23 |
|
24 |
31 May 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.0.ebuild: |
25 |
+ Added src_test(). |
26 |
+ |
27 |
+ 31 May 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.0.ebuild: |
28 |
The "-DALLOCA_H" compiler flag appears to be unnecessary... |
29 |
|
30 |
30 May 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.0.ebuild, |
31 |
|
32 |
diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild |
33 |
index d387966..3d6c871 100644 |
34 |
--- a/sys-cluster/charm/charm-6.5.0.ebuild |
35 |
+++ b/sys-cluster/charm/charm-6.5.0.ebuild |
36 |
@@ -70,14 +70,10 @@ src_prepare() { |
37 |
} |
38 |
|
39 |
src_compile() { |
40 |
- # build charmm++ first |
41 |
+ # Build charmm++ first. |
42 |
./build charm++ net-linux$( use amd64 && echo "-amd64" ) ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || \ |
43 |
die "Failed to build charm++" |
44 |
|
45 |
- # make charmc play well with gentoo before |
46 |
- # we move it into /usr/bin |
47 |
- epatch "${FILESDIR}/charm-6.5.0-charmc-gentoo.patch" |
48 |
- |
49 |
# make pdf/html docs |
50 |
if use doc; then |
51 |
cd "${S}"/doc |
52 |
@@ -85,7 +81,14 @@ src_compile() { |
53 |
fi |
54 |
} |
55 |
|
56 |
+src_test() { |
57 |
+ make -C tests/charm++ test TESTOPTS="++local" |
58 |
+} |
59 |
+ |
60 |
src_install() { |
61 |
+ # Make charmc play well with gentoo before we move it into /usr/bin. |
62 |
+ epatch "${FILESDIR}/charm-6.5.0-charmc-gentoo.patch" |
63 |
+ |
64 |
sed -e "s|gentoo-include|${P}|" \ |
65 |
-e "s|gentoo-libdir|$(get_libdir)|g" \ |
66 |
-e "s|VERSION|${P}/VERSION|" \ |