diff options
| author |   Jeffrey Gardner <je_fro@gentoo.org> | 2009-06-01 04:32:10 +0000 |
|---|---|---|
| committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-06-01 04:32:10 +0000 |
| commit | de9f2245da9435f4da0b4ce1b6f86ac7943a30b4 (patch) | |
| tree | 6848e47cd608382623e0aea054b5e83749fecd22 /sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch | |
| parent | clean old ebuilds and files (diff) | |
| download | gentoo-2-de9f2245da9435f4da0b4ce1b6f86ac7943a30b4.tar.gz gentoo-2-de9f2245da9435f4da0b4ce1b6f86ac7943a30b4.tar.bz2 gentoo-2-de9f2245da9435f4da0b4ce1b6f86ac7943a30b4.zip | |
latest version
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch')
| -rw-r--r-- | sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch new file mode 100644 index 000000000000..4c4cfceeaa4a --- /dev/null +++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch @@ -0,0 +1,26 @@ +--- src/scripts/charmc.old 2009-05-31 23:09:12.285687725 -0500 ++++ src/scripts/charmc 2009-05-31 23:08:49.782155308 -0500 +@@ -335,19 +335,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" + + ############################################################################## + # + |