diff options
2 files changed, 15 insertions, 69 deletions
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch.base64 b/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch.base64 deleted file mode 100644 index ff1e7d4..0000000 --- a/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch.base64 +++ /dev/null @@ -1,60 +0,0 @@ -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 diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild index e489c4e..2961aa2 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild @@ -181,7 +181,7 @@ RDEPEND=" " PDEPEND="~app-emulation/vmware-modules-${PV_MODULES} vmware-tools? ( app-emulation/vmware-tools )" -DEPEND="dev-util/bsdiff" +DEPEND=">=dev-util/patchelf-0.9" S=${WORKDIR} VM_INSTALL_DIR="/opt/vmware" @@ -238,14 +238,20 @@ clean_bundled_libs() { pushd >/dev/null . einfo "Patching libcds.so" cd "${S}"/lib/lib/libcds.so || die - cp libcds.so "${T}"/libcds.so || die - # The patch is created with patchelf > 0.8 (so using the live repository), bsdiff, and base64: - # The following command should be replaced in the future with: - # patchelf --replace-needed libssl.so.1.0.{1,0} \ - # --replace-needed libcrypto.so.1.0.{1,0} \ - # libcds.so - base64 -d "${FILESDIR}"/${P}-unbundle-libcds.patch.base64 > "${T}"/${P}-unbundle-libcds.patch || die - bspatch "${T}"/libcds.so libcds.so "${T}"/${P}-unbundle-libcds.patch || die + patchelf --replace-needed libssl.so.1.0.{1,0} \ + --replace-needed libcrypto.so.1.0.{1,0} \ + libcds.so || die + popd >/dev/null + + # vmware-workstation seems to use a custom version of libgksu2.so, for this reason + # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED + # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage + # preserve-libs mechanism to be triggered when a system lib is available (but not required) + pushd >/dev/null . + einfo "Patching libvmware-gksu.so" + cd "${S}"/lib/lib/libvmware-gksu.so || die + patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ + libvmware-gksu.so || die popd >/dev/null } |