| 1 |
commit: 98b8429c7b085d4ee07887c4427193dd7e974ba5 |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 2 17:08:36 2013 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jul 2 17:08:36 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=98b8429c |
| 7 |
|
| 8 |
Added missing patch. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha186 |
| 11 |
|
| 12 |
--- |
| 13 |
sys-cluster/charm/ChangeLog | 4 ++++ |
| 14 |
sys-cluster/charm/charm-6.5.1.ebuild | 3 +++ |
| 15 |
.../charm/files/charm-6.5.0-charmc-gentoo.patch | 25 ++++++++++++++++++++++ |
| 16 |
3 files changed, 32 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog |
| 19 |
index 3563efb..4d51c0e 100644 |
| 20 |
--- a/sys-cluster/charm/ChangeLog |
| 21 |
+++ b/sys-cluster/charm/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 02 Jul 2013; Nicolas Bock <nicolasbock@×××××.com> |
| 27 |
+ +files/charm-6.5.0-charmc-gentoo.patch, charm-6.5.1.ebuild: |
| 28 |
+ Added missing patch. |
| 29 |
+ |
| 30 |
*charm-6.5.1 (02 Jul 2013) |
| 31 |
|
| 32 |
02 Jul 2013; Nicolas Bock <nicolasbock@×××××.com> +charm-6.5.1.ebuild, |
| 33 |
|
| 34 |
diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild |
| 35 |
index 25982f8..74ba894 100644 |
| 36 |
--- a/sys-cluster/charm/charm-6.5.1.ebuild |
| 37 |
+++ b/sys-cluster/charm/charm-6.5.1.ebuild |
| 38 |
@@ -75,6 +75,9 @@ src_prepare() { |
| 39 |
src/scripts/Makefile \ |
| 40 |
src/arch/net/charmrun/Makefile || die |
| 41 |
|
| 42 |
+ # Fix QA notice. |
| 43 |
+ append-cflags -DALLOCA_H |
| 44 |
+ |
| 45 |
einfo "charm opts: ${CHARM_OPTS}" |
| 46 |
} |
| 47 |
|
| 48 |
|
| 49 |
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 |
| 50 |
new file mode 100644 |
| 51 |
index 0000000..34923e3 |
| 52 |
--- /dev/null |
| 53 |
+++ b/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch |
| 54 |
@@ -0,0 +1,25 @@ |
| 55 |
+--- src/scripts/charmc.old 2013-05-30 10:18:02.261819771 -0600 |
| 56 |
++++ src/scripts/charmc 2013-05-30 10:19:50.839661634 -0600 |
| 57 |
+@@ -361,19 +361,9 @@ |
| 58 |
+ PROG_EXT=".exe" |
| 59 |
+ fi |
| 60 |
+ |
| 61 |
+-CHARMLIB="$CHARMBIN/../lib" |
| 62 |
+-CHARMINC="$CHARMBIN/../include" |
| 63 |
+-CHARMLIBSO= |
| 64 |
+-if test -d "$CHARMBIN/../lib_so" |
| 65 |
+-then |
| 66 |
+- CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd` |
| 67 |
+- #getting absolute path is harder than thought because of symbolic links and .. |
| 68 |
+- #ksh needs cd -P to resolve werid symbolic links, however -P is not portable |
| 69 |
+- #csh is ok too if it exists |
| 70 |
+- test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd` |
| 71 |
+- test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"` |
| 72 |
+- test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1 |
| 73 |
+-fi |
| 74 |
++CHARMLIB="/usr/gentoo-libdir" |
| 75 |
++CHARMINC="/usr/include/gentoo-include" |
| 76 |
++CHARMLIBSO="/usr/gentoo-libdir" |
| 77 |
+ |
| 78 |
+ ############################################################################## |
| 79 |
+ # |
Archives