summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Rossi <rossi.f@inwind.it>2016-04-19 22:49:21 +0200
committerFabio Rossi <rossi.f@inwind.it>2016-04-19 22:56:36 +0200
commitfb50c3c5f65712f407256da161bf8402a786d296 (patch)
tree40b11b41570ec7d97881e7366edd858444930906 /app-emulation/vmware-workstation
parentapp-emulation/vmware-workstation: other workarounds for bundled-libs (diff)
downloadvmware-fb50c3c5f65712f407256da161bf8402a786d296.tar.gz
vmware-fb50c3c5f65712f407256da161bf8402a786d296.tar.bz2
vmware-fb50c3c5f65712f407256da161bf8402a786d296.zip
app-emulation/vmware-workstation: remove rpath patching for glib/fontconfig
Revert partially part of commit 050003bb7077b9121a81452e28779c343d1f0004. Forcing embedded glib causes other problems when VMWARE_USE_SHIPPED_LIBS is not set (bug #578956).
Diffstat (limited to 'app-emulation/vmware-workstation')
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild17
1 files changed, 0 insertions, 17 deletions
diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
index 110bce2..fa77191 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
@@ -224,23 +224,6 @@ clean_bundled_libs() {
patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
svg_loader.so || die
popd >/dev/null
-
- # vmware, even with VMWARE_USE_SHIPPED_LIBS set, uses the system lib
- # for glib and fontconfig when a newer version is found. Let's force to use
- # always the bundled versions to avoid a mix of system and bundled libs ...
- pushd >/dev/null .
- einfo "Patching appLoader"
- cd "${S}"/lib/bin || die
- patchelf --set-rpath "\$ORIGIN/../lib/libglib-2.0.so.0:\$ORIGIN/../lib/libfontconfig.so.1" \
- appLoader || die
- popd >/dev/null
- # ... this depends on previous appLoader patching, probably it is not mandatory but cleans the log
- pushd >/dev/null .
- einfo "Patching libfontconfig.so.1"
- cd "${S}"/lib/lib/libfontconfig.so.1 || die
- patchelf --set-rpath "\$ORIGIN/../libexpat.so.0" \
- libfontconfig.so.1 || die
- popd >/dev/null
fi
}