diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2014-09-26 20:43:32 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2014-09-26 20:43:32 +0000 |
| commit | e7571938e1c14b4bec35f7c083f1fe6bf0373daa (patch) | |
| tree | 939a7354a714d39a8d18aaa447a7f0d947dc49e8 /sys-cluster | |
| parent | Version bump to 1.6.0. (diff) | |
| download | gentoo-2-e7571938e1c14b4bec35f7c083f1fe6bf0373daa.tar.gz gentoo-2-e7571938e1c14b4bec35f7c083f1fe6bf0373daa.tar.bz2 gentoo-2-e7571938e1c14b4bec35f7c083f1fe6bf0373daa.zip | |
clean up install
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-6.6.0.ebuild | 20 |
2 files changed, 9 insertions, 16 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index 5215b3cb5d4f..a329c0a0de5f 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/charm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.41 2014/09/26 19:04:03 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.42 2014/09/26 20:43:32 ottxor Exp $ + + 26 Sep 2014; Christoph Junghans <ottxor@gentoo.org> charm-6.6.0.ebuild: + clean up install *charm-6.6.0 (26 Sep 2014) diff --git a/sys-cluster/charm/charm-6.6.0.ebuild b/sys-cluster/charm/charm-6.6.0.ebuild index a32f2c19f3eb..2a00ee3344e1 100644 --- a/sys-cluster/charm/charm-6.6.0.ebuild +++ b/sys-cluster/charm/charm-6.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.1 2014/09/26 19:04:03 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.2 2014/09/26 20:43:32 ottxor Exp $ EAPI=5 @@ -166,23 +166,13 @@ src_install() { doins "${i}" done - # Install static libs. Charm has a lot of .o "libs" that it requires at - # runtime. - if use static-libs; then - for i in lib/*.{a,o}; do - if [[ -L ${i} ]]; then - i=$(readlink -e "${i}") || die - fi - dolib "${i}" - done - fi - - # Install shared libs. - for i in lib_so/*; do + # Install libs incl. charm objects + for i in lib*/*.{so,o,a}; do + [[ ${i} = *.a ]] && use !static-libs && continue if [[ -L ${i} ]]; then i=$(readlink -e "${i}") || die fi - dolib.so "${i}" + [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" done # Basic docs. |