From fb50c3c5f65712f407256da161bf8402a786d296 Mon Sep 17 00:00:00 2001 From: Fabio Rossi Date: Tue, 19 Apr 2016 22:49:21 +0200 Subject: 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). --- .../vmware-workstation-12.1.0.3272444-r2.ebuild | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'app-emulation') 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 } -- cgit v1.2.3-18-g5258