jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/openvmtools: use libtirpc when toolchain has no native RPC

Browse Source 
openvmtools detects and uses an external RPC library if RPC is not
supported by the toolchain C library, so let's select package/libtirpc
when necessary.

Signed-off-by: Simon Rowe <simon.rowe@citrix.com>
[Thomas: add missing dependency on libtirpc]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Simon Rowe 2019-07-25 09:30:21 +01:00 committed by Thomas Petazzoni
parent a6132bcb78
commit d006737faa
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/openvmtools/Config.in
View File

@ -4,11 +4,11 @@ config BR2_PACKAGE_OPENVMTOOLS
depends on BR2_USE_MMU # libglib2 depends on BR2_USE_MMU # libglib2
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_ENABLE_LOCALE depends on BR2_ENABLE_LOCALE
depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_USES_UCLIBC
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBDNET select BR2_PACKAGE_LIBDNET
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
Open Virtual Machine Tools for VMware guest OS Open Virtual Machine Tools for VMware guest OS
@ -61,9 +61,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads"
endif endif
comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale" comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale"
depends on BR2_i386 || BR2_x86_64 depends on BR2_i386 || BR2_x86_64
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \ !BR2_ENABLE_LOCALE || \
BR2_TOOLCHAIN_USES_UCLIBC BR2_TOOLCHAIN_USES_UCLIBC

4
package/openvmtools/openvmtools.mk
View File

@ -20,6 +20,10 @@ OPENVMTOOLS_CONF_OPTS = --with-dnet \
OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" " OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" "
OPENVMTOOLS_DEPENDENCIES = host-nfs-utils libglib2 libdnet OPENVMTOOLS_DEPENDENCIES = host-nfs-utils libglib2 libdnet
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
OPENVMTOOLS_DEPENDENCIES += libtirpc
endif
# When libfuse is available, openvmtools can build vmblock-fuse, so # When libfuse is available, openvmtools can build vmblock-fuse, so
# make sure that libfuse gets built first # make sure that libfuse gets built first
ifeq ($(BR2_PACKAGE_LIBFUSE),y) ifeq ($(BR2_PACKAGE_LIBFUSE),y)