mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-09 19:31:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

open-vm-tools: always set rpath to OEM library directory

Browse Source 
By default /usr/share/oem/lib64 is included in ld.so.conf but if for any
reason ld.so.cache is generated incorrectly vmtoolsd will fail. Using
rpath instead avoids depending on the state of ld.so.cache.
This commit is contained in:
Michael Marineau 2014-12-22 20:25:33 -08:00
parent 125daa5bf9
commit 95c9f35743
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r2.ebuild vendored
View File

@ -6,7 +6,7 @@ EAPI=5
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils toolchain-funcs git-2
inherit autotools-utils flag-o-matic git-2 multilib toolchain-funcs
DESCRIPTION="VMware tools for distribution via /usr/share/oem"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
@ -62,11 +62,17 @@ override_vmw_check_lib() {
}
src_configure() {
local oemlib="/usr/share/oem/$(get_libdir)"
local oeminc="/usr/share/oem/include"
# set rpath even if oem is in ld.so.conf
append-ldflags "-Wl,-rpath,${oemlib}"
# libdnet is installed to /usr/share/oem
export CUSTOM_DNET_CPPFLAGS="-I${SYSROOT}/usr/share/oem/include"
export CUSTOM_DNET_LIBS="-L${SYSROOT}/usr/share/oem/lib64"
export CUSTOM_MSPACK_CPPFLAGS="-I${SYSROOT}/usr/share/oem/include"
export CUSTOM_MSPACK_LIBS="-L${SYSROOT}/usr/share/oem/lib64"
export CUSTOM_DNET_CPPFLAGS="-I${SYSROOT}${oeminc}"
export CUSTOM_DNET_LIBS="-L${SYSROOT}${oemlib}"
export CUSTOM_MSPACK_CPPFLAGS="-I${SYSROOT}${oeminc}"
export CUSTOM_MSPACK_LIBS="-L${SYSROOT}${oemlib}"
# >=sys-process/procps-3.3.2 not handled by configure
export CUSTOM_PROCPS_NAME=procps