diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-06-27 00:01:50 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-06-27 00:01:50 +0000 |
| commit | 84ed1914098f814b79a388c235fa6aab41ad82df (patch) | |
| tree | 550bae8834c982a9620860c80e28ac595ff67628 /sys-cluster | |
| parent | initial commit of multimon-ng (diff) | |
| download | gentoo-2-84ed1914098f814b79a388c235fa6aab41ad82df.tar.gz gentoo-2-84ed1914098f814b79a388c235fa6aab41ad82df.tar.bz2 gentoo-2-84ed1914098f814b79a388c235fa6aab41ad82df.zip | |
added missing patch
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch | 25 |
2 files changed, 30 insertions, 1 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index ec5ebb5d3deb..74848845d058 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/charm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.34 2013/06/26 23:58:38 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.35 2013/06/27 00:01:50 ottxor Exp $ + + 27 Jun 2013; Christoph Junghans <ottxor@gentoo.org> + +files/charm-6.5.0-charmc-gentoo.patch: + added missing patch *charm-6.5.0 (26 Jun 2013) diff --git a/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch new file mode 100644 index 000000000000..34923e3f78d3 --- /dev/null +++ b/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch @@ -0,0 +1,25 @@ +--- src/scripts/charmc.old 2013-05-30 10:18:02.261819771 -0600 ++++ src/scripts/charmc 2013-05-30 10:19:50.839661634 -0600 +@@ -361,19 +361,9 @@ + 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" + + ############################################################################## + # |