diff options
| author |   Nicolas Bock <nicolasbock@gmail.com> | 2013-05-30 12:26:41 -0600 |
|---|---|---|
| committer | Nicolas Bock <nicolasbock@gmail.com> | 2013-05-30 12:26:41 -0600 |
| commit | 55f5e6d4104fb2d81171d709ab53be68e7504c99 (patch) | |
| tree | 89a8c342ce8338b8f0cb9d98ac59542ee4566dec /sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch | |
| parent | sci-chemistry/freeon improved, the ebuild of the latest snapshot added. sci-c... (diff) | |
| download | sci-55f5e6d4104fb2d81171d709ab53be68e7504c99.tar.gz sci-55f5e6d4104fb2d81171d709ab53be68e7504c99.tar.bz2 sci-55f5e6d4104fb2d81171d709ab53be68e7504c99.zip | |
Version bump to sys-cluster/charm-6.5.0.
This ebuild fixes bugs 471740 and 432834.
Package-Manager: portage-2.2.0_alpha177
Diffstat (limited to 'sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch')
| -rw-r--r-- | sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch | 25 |
1 files changed, 25 insertions, 0 deletions
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 000000000..34923e3f7 --- /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" + + ############################################################################## + # |