diff options
| author |   Jeffrey Gardner <je_fro@gentoo.org> | 2009-06-01 03:15:58 +0000 |
|---|---|---|
| committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-06-01 03:15:58 +0000 |
| commit | b5c6d9a25e5417dfaf8fe7953781dbf2d9e73b59 (patch) | |
| tree | 2b826832f0bb926b766fea38366569e654234961 | |
| parent | latest charm for testing (diff) | |
| download | je_fro-b5c6d9a25e5417dfaf8fe7953781dbf2d9e73b59.tar.gz je_fro-b5c6d9a25e5417dfaf8fe7953781dbf2d9e73b59.tar.bz2 je_fro-b5c6d9a25e5417dfaf8fe7953781dbf2d9e73b59.zip | |
fix VERSION given by charmc
svn path=/; revision=284
| -rw-r--r-- | sys-cluster/charm/Manifest | 4 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-6.1.2.ebuild | 14 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch | 9 |
3 files changed, 16 insertions, 11 deletions
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest index 21fe926..6b7657f 100644 --- a/sys-cluster/charm/Manifest +++ b/sys-cluster/charm/Manifest @@ -1,6 +1,6 @@ -AUX charm-6.1.2-charmc-gentoo.patch 413 RMD160 237b3206be5c853c18edc1a2c714133ab940fabc SHA1 34605470feb48f2809d7ba5b188487df88bcac77 SHA256 1885e4f6ed64ee2323114aa8c54aa20465be3c4e4f37a5cbc2bbc04a7677b675 +AUX charm-6.1.2-charmc-gentoo.patch 446 RMD160 1ef514f464a885f09bde4cca33eac6c2b7807ed8 SHA1 7b3d49a1bfd4ecdc7ac44b5737593abb644717fb SHA256 44004b8f9ea8a46887f92906edb3ab12b92f5689c2188d75fb491cb0ca645731 AUX charm-6.1.2-charmrun.patch 451 RMD160 c6fbdf5fd290d5d5c0d52a8b521326f080ed646e SHA1 22a398366f8df2a37253c034afefe33566cc3105 SHA256 2e3a0279f81e76cfb5087f6c23cc0e39dff50618b0635925e373cd0c773ce603 AUX charm-9999-charmc-gentoo.patch 963 RMD160 0f6001288cc8e9fa2d471c0d7cb9395d6fcd6399 SHA1 a68f5edab5da468a425dd8f17956c48ad0f85676 SHA256 b46d982eb9244d9e97cf7a48afd320e84788a060beddfa86b13be18547e93138 DIST charm_src.tar.gz 23903605 RMD160 6a4ec1e725001073903de0241f23c7e53cdb5e97 SHA1 0443fe79a4d7f489c227316a50927ed9c71685d5 SHA256 d30a6d069d334760fcf919d1f6dba3ac76b64336fe7570e43f91af8de5b21839 -EBUILD charm-6.1.2.ebuild 3122 RMD160 4ea0c7fce425c5a454b635b8c91fccced7e56603 SHA1 296fb11c6e3c795fa4f0984a2338d7d7a4bb9d96 SHA256 008d757d14032b48563137c5fa24df36df710ee8866316d494029ff00aff8f1f +EBUILD charm-6.1.2.ebuild 3228 RMD160 06e288679cd17c88a2338dd5a307d70651e46940 SHA1 889a9014f504328364c802421ac7cd39ba9b6b8a SHA256 8d1b5d5cbf8cca64e462665dc647fcc08289567d20d077f0bf5531a7709b8605 EBUILD charm-9999.ebuild 3335 RMD160 1dfce9d798191fe74bb5a04e9ba7bb3fddc7210f SHA1 4154bbb0eac565832074f6f03c526eb04afe5d00 SHA256 c75770a17900a6553339335fdeb63e72e409ef3f4eeab77f4ba18b41f1a66f09 diff --git a/sys-cluster/charm/charm-6.1.2.ebuild b/sys-cluster/charm/charm-6.1.2.ebuild index 0864319..fd4422f 100644 --- a/sys-cluster/charm/charm-6.1.2.ebuild +++ b/sys-cluster/charm/charm-6.1.2.ebuild @@ -34,11 +34,6 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P}-charmrun.patch" - epatch "${FILESDIR}/${P}-charmc-gentoo.patch" - - sed -e "s|gentoo-include|${P}|" \ - -e "s|gentoo-libdir|$(get_libdir)|g" \ - -i ./src/scripts/charmc || die "failed patching charmc script" # TCP instead of default UDP for socket comunication # protocol @@ -84,6 +79,15 @@ src_compile() { } src_install() { + # make charmc play well with gentoo before + # we move it into /usr/bin + epatch "${FILESDIR}/${P}-charmc-gentoo.patch" + + sed -e "s|gentoo-include|${P}|" \ + -e "s|gentoo-libdir|$(get_libdir)|g" \ + -e "s|VERSION|${P}/VERSION|" \ + -i ./src/scripts/charmc || die "failed patching charmc script" + # install binaries cd "${S}"/bin dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \ 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 f869ecf..5c38ea8 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,13 +1,14 @@ ---- src/scripts/charmc.orig 2009-05-31 14:35:11.998681697 -0500 -+++ src/scripts/charmc 2009-05-31 14:36:35.833571993 -0500 +--- src/scripts/charmc.orig 2009-05-31 16:11:24.772005740 -0500 ++++ src/scripts/charmc 2009-05-31 16:12:31.329000876 -0500 @@ -335,9 +335,9 @@ PROG_EXT=".exe" fi -CHARMLIB="$CHARMBIN/../lib" -+CHARMLIB="$CHARMBIN/../gentoo-libdir" - CHARMINC="$CHARMBIN/../include" +-CHARMINC="$CHARMBIN/../include" -CHARMLIBSO= ++CHARMLIB="$/usr/gentoo-libdir" ++CHARMINC="/usr/include/gentoo-include" +CHARMLIBSO="/usr/gentoo-libdir" if test -d "$CHARMBIN/../lib_so" then |