diff options
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-6.5.1-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch | 10 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.5.1-charmc-gentoo.patch | 39 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch | 14 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch | 14 |
6 files changed, 71 insertions, 21 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index 618de1d01..ace12f172 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> + +files/charm-6.5.1-charmc-gentoo.patch, charm-6.5.1-r1.ebuild, + files/charm-6.5.1-CkReductionMgr.patch, + files/charm-6.5.1-cleanup-config.patch, + files/charm-6.5.1-fix-string-parsing.patch: + sys-clyster/charm-6.5.1-r1: Fix missing DEPEND. This addresses bug 486202. + The ebuild had a missing DEPEND using the doc USE flag. + 14 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> files/charm-6.5.1-fix-string-parsing.patch: sys-cluster/charm-6.5.1: Small fix in patch to make printing less verbose. diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild index 25b056000..1b7cb1b71 100644 --- a/sys-cluster/charm/charm-6.5.1-r1.ebuild +++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild @@ -22,6 +22,7 @@ DEPEND=" >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base + dev-python/beautifulsoup )" REQUIRED_USE=" @@ -112,8 +113,10 @@ src_test() { } src_install() { - # Make charmc play well with gentoo before we move it into /usr/bin. - epatch "${FILESDIR}/charm-6.5.0-charmc-gentoo.patch" + # Make charmc play well with gentoo before we move it into /usr/bin. This + # patch cannot be applied during src_prepare() because the charmc wrapper + # is used during building. + epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" sed -e "s|gentoo-include|${P}|" \ -e "s|gentoo-libdir|$(get_libdir)|g" \ diff --git a/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch b/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch index 8387180f0..ad07fc3aa 100644 --- a/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch +++ b/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch @@ -1,7 +1,7 @@ -From f9cc5724818141201ba201e698c21aea62ecd362 Mon Sep 17 00:00:00 2001 +From 6b537784e9c345dee7f7cfd108c6abc779a969ae Mon Sep 17 00:00:00 2001 From: Nicolas Bock <nicolasbock@gmail.com> -Date: Thu, 5 Sep 2013 04:04:06 -0600 -Subject: [PATCH] Fixed bug in CkReductionMgr::reduceMessages(). +Date: Fri, 27 Sep 2013 10:50:45 -0600 +Subject: [PATCH 2/4] Fixed bug in CkReductionMgr::reduceMessages(). The first contribution of a child node is a single message. In this case CkReductionMgr::reduceMessages() simply returns the message without calling @@ -17,10 +17,10 @@ message. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ck-core/ckreduction.C b/src/ck-core/ckreduction.C -index f2ac8cd..d94f5b1 100644 +index 07853a2..ef3e906 100644 --- a/src/ck-core/ckreduction.C +++ b/src/ck-core/ckreduction.C -@@ -862,7 +862,7 @@ CkReductionMsg *CkReductionMgr::reduceMessages(void) +@@ -850,7 +850,7 @@ CkReductionMsg *CkReductionMgr::reduceMessages(void) else {//Use the reducer to reduce the messages //if there is only one msg to be reduced just return that message diff --git a/sys-cluster/charm/files/charm-6.5.1-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.5.1-charmc-gentoo.patch new file mode 100644 index 000000000..f1502ced7 --- /dev/null +++ b/sys-cluster/charm/files/charm-6.5.1-charmc-gentoo.patch @@ -0,0 +1,39 @@ +From 664eb097d1c5d1a158b1f41badc79d369a06aab6 Mon Sep 17 00:00:00 2001 +From: Nicolas Bock <nicolasbock@gmail.com> +Date: Fri, 27 Sep 2013 10:53:31 -0600 +Subject: [PATCH 4/4] Fix paths for gentoo. + +--- + src/scripts/charmc | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +diff --git a/src/scripts/charmc b/src/scripts/charmc +index 4d37a6b..8ec2f70 100755 +--- a/src/scripts/charmc ++++ b/src/scripts/charmc +@@ -361,19 +361,9 @@ then + PROG_EXT=".exe" + fi + +-CHARMLIB="$CHARMBIN/../lib" +-CHARMINC="$CHARMBIN/../include" +-CHARMLIBSO= +-if test -d "$CHARMBIN/../lib_so" +-then +- CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd` +- #getting absolute path is harder than thought because of symbolic links and .. +- #ksh needs cd -P to resolve werid symbolic links, however -P is not portable +- #csh is ok too if it exists +- test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd` +- test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"` +- test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1 +-fi ++CHARMLIB="/usr/gentoo-libdir" ++CHARMINC="/usr/include/gentoo-include" ++CHARMLIBSO="/usr/gentoo-libdir" + + ############################################################################## + # +-- +1.8.1.5 + diff --git a/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch b/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch index 89834e4d6..ec71eb27d 100644 --- a/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch +++ b/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch @@ -1,7 +1,7 @@ -From 04639c20479564a2b5e662d90de953e3f37b0360 Mon Sep 17 00:00:00 2001 +From b0af812652269a59457ad1bbf57165c0543bcd07 Mon Sep 17 00:00:00 2001 From: Nicolas Bock <nicolasbock@gmail.com> -Date: Tue, 23 Jul 2013 11:19:22 -0600 -Subject: [PATCH] Commented out colliding defines in conv-autoconfig.h +Date: Fri, 27 Sep 2013 10:49:52 -0600 +Subject: [PATCH 1/4] Commented out colliding defines in conv-autoconfig.h The colliding defines (bug #252) are commented out in configure. --- @@ -10,7 +10,7 @@ The colliding defines (bug #252) are commented out in configure. 2 files changed, 8 insertions(+) diff --git a/src/scripts/configure b/src/scripts/configure -index 2629834..03dc778 100755 +index acd582c..faf268f 100755 --- a/src/scripts/configure +++ b/src/scripts/configure @@ -1703,6 +1703,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -23,7 +23,7 @@ index 2629834..03dc778 100755 CHARMINC="." test -r ./conv-config.sh && . ./conv-config.sh -@@ -5201,6 +5204,7 @@ for ac_config_target in $ac_config_targets +@@ -5259,6 +5262,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "conv-autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS conv-autoconfig.h" ;; @@ -31,7 +31,7 @@ index 2629834..03dc778 100755 "libs/ck-libs/ampi/ampiCC") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampiCC" ;; "libs/ck-libs/ampi/ampirun") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampirun" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; -@@ -5754,6 +5758,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} +@@ -5812,6 +5816,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in @@ -40,7 +40,7 @@ index 2629834..03dc778 100755 ;; diff --git a/src/scripts/configure.in b/src/scripts/configure.in -index 69e5318..2cb18b6 100644 +index d1285ed..cad9a42 100644 --- a/src/scripts/configure.in +++ b/src/scripts/configure.in @@ -3,6 +3,9 @@ AC_INIT(./Makefile) diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch index 06bdf0df1..1cc6b432c 100644 --- a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch +++ b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch @@ -1,21 +1,21 @@ -From 7a8bf20508f54a223c13e62c7c485a7de4aaeba0 Mon Sep 17 00:00:00 2001 +From 14f407a5d183cdac7029cc54a9d8ae6b0cb5cbcd Mon Sep 17 00:00:00 2001 From: Nicolas Bock <nicolasbock@gmail.com> -Date: Wed, 11 Sep 2013 14:13:30 -0600 -Subject: [PATCH] charmrun.c: parsing of strings now parses "\n" into '\n' +Date: Fri, 27 Sep 2013 10:52:18 -0600 +Subject: [PATCH 3/4] charmrun.c: parsing of strings now parses "\n" into '\n' Since gdb lacks anything like ';' to separate several commands in one line, the commands need to be separated by a newline character. I have added some parsing logic so that the string "\n" will now be translated into the character '\n'. --- - src/arch/net/charmrun/charmrun.c | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) + src/arch/net/charmrun/charmrun.c | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/arch/net/charmrun/charmrun.c b/src/arch/net/charmrun/charmrun.c -index 6837712..bf370c1 100644 +index 6837712..8818cf8 100644 --- a/src/arch/net/charmrun/charmrun.c +++ b/src/arch/net/charmrun/charmrun.c -@@ -454,8 +454,28 @@ static int pparam_setdef(def, value) +@@ -454,8 +454,27 @@ static int pparam_setdef(def, value) if (*p) return -1; return 0; case 's' : |