diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2006-10-04 09:17:45 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2006-10-04 09:17:45 +0000 |
| commit | 150a72bc13bad6c0f97c13d4ed0b24918e498c33 (patch) | |
| tree | 69cd3917cd99ffcae3588ef222be5d2248cf9642 /eclass | |
| parent | Openssl bug fixes. Hopefully the last time... (diff) | |
| download | vmware-150a72bc13bad6c0f97c13d4ed0b24918e498c33.tar.gz vmware-150a72bc13bad6c0f97c13d4ed0b24918e498c33.tar.bz2 vmware-150a72bc13bad6c0f97c13d4ed0b24918e498c33.zip | |
Sync eclass with tree, and fix directory/file mismatch
svn path=/trunk/; revision=117
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/vmware.eclass | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass index 68ffce3..1ddefc7 100644 --- a/eclass/vmware.eclass +++ b/eclass/vmware.eclass @@ -152,7 +152,10 @@ vmware_src_unpack() { done fi # Unpack our new libs. - unpack vmware-libssl.so.0.9.7l.tar.bz2 + [ -f "${DISTDIR}"/vmware-libssl.so.0.9.7l.tar.bz2 ] && \ + unpack vmware-libssl.so.0.9.7l.tar.bz2 + [ -f "${DISTDIR}"/vmware-libcrypto.so.0.9.7l.tar.bz2 ] && \ + unpack vmware-libcrypto.so.0.9.7l.tar.bz2 fi } @@ -198,6 +201,13 @@ vmware_src_install() { # Now, we move in our own cp -pPR "${S}"/libssl.so.0.9.7 "${S}"/lib/lib fi + # We remove the shipped libcrypto for bug #148682 + if [ -d "${S}"/lib/lib/libcrypto.so.0.9.7 ] + then + rm -rf "${S}"/lib/lib/libcrypto.so.0.9.7 + # Now, we move in our own + cp -pPR "${S}"/libcrypto.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 |