diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-04 07:34:13 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-11-06 08:20:17 +0100 |
| commit | 2fb1a48ad80a765a1f46e183d3ecf742adfbfca9 (patch) | |
| tree | 2b89a3fa6a7fe97c793bc35af132e7303a89a259 | |
| parent | 80f7a4b6797d11fbf3808a8af8b5e5f58048f117 (diff) | |
| download | buildroot-novena-2fb1a48ad80a765a1f46e183d3ecf742adfbfca9.tar.gz buildroot-novena-2fb1a48ad80a765a1f46e183d3ecf742adfbfca9.zip | |
nfs-utils: add support to use RPC support from libtirpc
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/nfs-utils/Config.in | 7 | ||||
| -rw-r--r-- | package/nfs-utils/nfs-utils.mk | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index c87502f97..fa35f35e6 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_NFS_UTILS bool "nfs-utils" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_LARGEFILE - select BR2_PACKAGE_PORTMAP help The NFS Linux kernel server. Warning: We do not force largefile support on here on purpose. @@ -10,8 +9,8 @@ config BR2_PACKAGE_NFS_UTILS http://sourceforge.net/projects/nfs -comment "nfs-utils requires a toolchain with RPC and LARGEFILE support" - depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_LARGEFILE +comment "nfs-utils requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE menu "NFS utilities selection" depends on BR2_PACKAGE_NFS_UTILS diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 41a0e05c2..e59619f7c 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -16,7 +16,6 @@ NFS_UTILS_CONF_OPT = \ --disable-nfsv4 \ --disable-nfsv41 \ --disable-gss \ - --disable-tirpc \ --disable-uuid \ --disable-ipv6 \ --without-tcp-wrappers \ @@ -26,6 +25,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +NFS_UTILS_CONF_OPT += --enable-tirpc --with-tirpcinclude=$(STAGING_DIR)/usr/include/tirpc/ +NFS_UTILS_DEPENDENCIES += libtirpc +else +NFS_UTILS_CONF_OPT += --disable-tirpc +endif + define NFS_UTILS_INSTALL_FIXUP $(INSTALL) -m 0755 package/nfs-utils/S60nfs \ $(TARGET_DIR)/etc/init.d/S60nfs |