@@ -1,6 +1,6 @@
config BR2_PACKAGE_QUOTA
bool "quota"
- depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+ depends on BR2_RPC_SUPPORT_AVAILABLE
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR
select BR2_PACKAGE_UTIL_LINUX
@@ -12,5 +12,5 @@ config BR2_PACKAGE_QUOTA
http://sourceforge.net/projects/linuxquota/
-comment "quota requires a toolchain with RPC + LARGEFILE + WCHAR support"
- depends on !(BR2_TOOLCHAIN_HAS_NATIVE_RPC && BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "quota requires a toolchain with LARGEFILE + WCHAR support, and RPC (toolchain or libtirpc)"
+ depends on !(BR2_RPC_SUPPORT_AVAILABLE && BR2_LARGEFILE && BR2_USE_WCHAR)
@@ -8,13 +8,22 @@ QUOTA_VERSION = 4.00
QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
QUOTA_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
-QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+QUOTA_CFLAGS = $(TARGET_CFLAGS)
+QUOTA_LDFLAGS = $(TARGET_LDFLAGS)
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
QUOTA_DEPENDENCIES = gettext libintl
-QUOTA_MAKE_OPT += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+QUOTA_LDFLAGS += -lintl
endif
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+QUOTA_DEPENDENCIES += libtirpc
+QUOTA_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+QUOTA_LDFLAGS += -ltirpc
+endif
+
+QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+
# Package uses autoconf but not automake.
QUOTA_INSTALL_TARGET_OPT = \
ROOTDIR=$(TARGET_DIR) \
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/quota/Config.in | 6 +++--- package/quota/quota.mk | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-)