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

Merge pull request #1024 from marineam/fixes

Browse Source 
vmtoolsd library path fixes
This commit is contained in:
Michael Marineau 2014-12-22 23:40:36 -08:00
commit 0f4c80175d
3 changed files with 12 additions and 6 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_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=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" DESCRIPTION="VMware tools for distribution via /usr/share/oem"
HOMEPAGE="http://open-vm-tools.sourceforge.net/" HOMEPAGE="http://open-vm-tools.sourceforge.net/"
@ -62,11 +62,17 @@ override_vmw_check_lib() {
} }
src_configure() { 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 # libdnet is installed to /usr/share/oem
export CUSTOM_DNET_CPPFLAGS="-I${SYSROOT}/usr/share/oem/include" export CUSTOM_DNET_CPPFLAGS="-I${SYSROOT}${oeminc}"
export CUSTOM_DNET_LIBS="-L${SYSROOT}/usr/share/oem/lib64" export CUSTOM_DNET_LIBS="-L${SYSROOT}${oemlib}"
export CUSTOM_MSPACK_CPPFLAGS="-I${SYSROOT}/usr/share/oem/include" export CUSTOM_MSPACK_CPPFLAGS="-I${SYSROOT}${oeminc}"
export CUSTOM_MSPACK_LIBS="-L${SYSROOT}/usr/share/oem/lib64" export CUSTOM_MSPACK_LIBS="-L${SYSROOT}${oemlib}"
# >=sys-process/procps-3.3.2 not handled by configure # >=sys-process/procps-3.3.2 not handled by configure
export CUSTOM_PROCPS_NAME=procps export CUSTOM_PROCPS_NAME=procps

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r43.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r44.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="~amd64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="f95c568766e4fc61858f164398a866aa9c8f37df" CROS_WORKON_COMMIT="2d74829987d0de4c6be2b4b194ed9fdedd50adc9"
KEYWORDS="amd64 arm x86" KEYWORDS="amd64 arm x86"
fi fi