diff options
| author |   Jeffrey Gardner <je_fro@gentoo.org> | 2009-11-27 08:49:04 +0000 |
|---|---|---|
| committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-11-27 08:49:04 +0000 |
| commit | 042b8944e85cdc72e536b8d1e1335541c8fa43a7 (patch) | |
| tree | c7c0eb1737d94b152ba5a8346b5053ff4a760712 /sys-cluster | |
| parent | Turn ewarn into elog for instructions on how to get gdb usable on 10.5+, as i... (diff) | |
| download | gentoo-2-042b8944e85cdc72e536b8d1e1335541c8fa43a7.tar.gz gentoo-2-042b8944e85cdc72e536b8d1e1335541c8fa43a7.tar.bz2 gentoo-2-042b8944e85cdc72e536b8d1e1335541c8fa43a7.zip | |
Fix patch
(Portage version: 2.1.7.7/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-6.1.2-r2.ebuild | 5 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch | 22 |
3 files changed, 25 insertions, 8 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index c3533b872a9f..6f343a81af44 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/charm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.25 2009/11/27 07:08:50 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.26 2009/11/27 08:49:04 je_fro Exp $ + + 27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> charm-6.1.2-r2.ebuild, + files/charm-6.1.2-charmc-gentoo.patch: + Fix patch again 27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> -charm-6.1.2.ebuild, -charm-6.1.2-r1.ebuild, files/charm-6.1.2-charmc-gentoo.patch: diff --git a/sys-cluster/charm/charm-6.1.2-r2.ebuild b/sys-cluster/charm/charm-6.1.2-r2.ebuild index a042f621b87b..629a8f450777 100644 --- a/sys-cluster/charm/charm-6.1.2-r2.ebuild +++ b/sys-cluster/charm/charm-6.1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.1 2009/11/27 05:26:01 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.2 2009/11/27 08:49:04 je_fro Exp $ inherit eutils toolchain-funcs flag-o-matic multilib @@ -68,6 +68,9 @@ src_compile() { } src_install() { +pwd + cd "${S}" +pwd # make charmc play well with gentoo before # we move it into /usr/bin epatch "${FILESDIR}/${P}-charmc-gentoo.patch" 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 index 89cec4bf7aa0..e381a7e1db8f 100644 --- a/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch +++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch @@ -1,12 +1,22 @@ ---- src/scripts/charmc.old 2009-11-27 00:57:14.260614376 -0600 -+++ src/scripts/charmc 2009-11-27 00:59:14.128805834 -0600 -@@ -343,9 +343,9 @@ +--- src/scripts/charmc 2009-11-27 02:24:30.648381166 -0600 ++++ src/scripts/charmc.new 2009-11-27 02:31:06.150618002 -0600 +@@ -343,19 +343,9 @@ PROG_EXT=".exe" fi --CHARMLIB="/usr/lib64" --CHARMINC="/usr/include/charm-6.1.2" --CHARMLIBSO="/usr/lib64" +-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" |