diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-02 15:52:58 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-02 15:52:58 +0000 |
| commit | f5039a7eb36be9ac110a16ffc0807c1808bda205 (patch) | |
| tree | a7b3316d708cabea8cdc437413009d4193923704 /eclass | |
| parent | Added ~ppc64; bug #149806 (diff) | |
| download | gentoo-2-f5039a7eb36be9ac110a16ffc0807c1808bda205.tar.gz gentoo-2-f5039a7eb36be9ac110a16ffc0807c1808bda205.tar.bz2 gentoo-2-f5039a7eb36be9ac110a16ffc0807c1808bda205.zip | |
Updated the eclass to only delete the libssl if it is 0.9.7...
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/vmware.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass index 93819b75fb35..39dcb6a00ee4 100644 --- a/eclass/vmware.eclass +++ b/eclass/vmware.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.9 2006/09/29 15:13:08 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.10 2006/10/02 15:52:58 wolf31o2 Exp $ # This eclass is for all vmware-* ebuilds in the tree and should contain all # of the common components across the multiple packages. @@ -190,7 +190,12 @@ vmware_src_install() { cd "${S}" # We remove the shipped libssl for bug #148682 - rm -rf "${S}"/lib/lib/libssl.so.0.9.* + if [ -d "${S}"/lib/lib/libssl.so.0.9.7 ] + then + rm -rf "${S}"/lib/lib/libssl.so.0.9.7 + # Now, we move in our own + cp -pPR "${S}"/libssl.so.0.9.7 "${S}"/lib/lib + fi # We loop through our directories and copy everything to our system. for x in bin lib sbin |