aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Simon Rowe <simon.rowe@citrix.com>2019-07-25 09:30:21 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-08-04 19:28:52 +0200
commitdaba307f158f19681698b8eb47da9b0f9e1bb951 (patch)
tree9d9bb3afb80046e195c84c983d09ff0b8d721427
parent6fbf182cf2258ae295143c2e8342b7c1c675a688 (diff)
downloadbuildroot-daba307f158f19681698b8eb47da9b0f9e1bb951.tar.gz
buildroot-daba307f158f19681698b8eb47da9b0f9e1bb951.tar.bz2
package/openvmtools: use libtirpc when toolchain has no native RPC
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> (cherry picked from commit d006737faa8b0eb31db1ac216eaa872704a9f1a6) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/openvmtools/Config.in6
-rw-r--r--package/openvmtools/openvmtools.mk4
2 files changed, 7 insertions, 3 deletions
diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in
index 72c0293de7..49d7189532 100644
--- a/package/openvmtools/Config.in
+++ b/package/openvmtools/Config.in
@@ -4,11 +4,11 @@ config BR2_PACKAGE_OPENVMTOOLS
depends on BR2_USE_MMU # libglib2
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
- depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_ENABLE_LOCALE
depends on !BR2_TOOLCHAIN_USES_UCLIBC
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBDNET
+ select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
help
Open Virtual Machine Tools for VMware guest OS
@@ -47,9 +47,9 @@ comment "PAM support needs a glibc toolchain w/ dynamic library"
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_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \
+ !BR2_ENABLE_LOCALE || \
BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
index 0dc2956d02..c5e3062212 100644
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -20,6 +20,10 @@ OPENVMTOOLS_CONF_OPTS = --with-dnet \
OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" "
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
# make sure that libfuse gets built first
ifeq ($(BR2_PACKAGE_LIBFUSE),y)