From patchwork Sun Nov 4 17:34:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 197067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 999F72C00C1 for ; Mon, 5 Nov 2012 04:36:22 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4BFACA0328; Sun, 4 Nov 2012 17:36:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f2Y3ZMk7wUaC; Sun, 4 Nov 2012 17:36:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 85F7EA0346; Sun, 4 Nov 2012 17:35:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 331888F74A for ; Sun, 4 Nov 2012 17:35:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 53CF28C40D for ; Sun, 4 Nov 2012 17:35:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4+HZ3vuvutjJ for ; Sun, 4 Nov 2012 17:35:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by whitealder.osuosl.org (Postfix) with ESMTP id 579A28C3F1 for ; Sun, 4 Nov 2012 17:35:09 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 71290289; Sun, 4 Nov 2012 18:33:44 +0100 (CET) Received: from localhost (182.Red-88-19-115.staticIP.rima-tde.net [88.19.115.182]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9DAAA14F for ; Sun, 4 Nov 2012 18:33:36 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sun, 4 Nov 2012 18:34:16 +0100 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 08/21] quota: add support to use RPC support from libtirpc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Thomas Petazzoni --- package/quota/Config.in | 6 +++--- package/quota/quota.mk | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/package/quota/Config.in b/package/quota/Config.in index a26f91f..f7d0fe9 100644 --- a/package/quota/Config.in +++ b/package/quota/Config.in @@ -1,15 +1,15 @@ config BR2_PACKAGE_QUOTA bool "quota" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_LARGEFILE depends on BR2_USE_WCHAR select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help Implementation of the disk quota system. 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" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) diff --git a/package/quota/quota.mk b/package/quota/quota.mk index abe3675..7019059 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -8,13 +8,22 @@ QUOTA_VERSION = 4.00 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz QUOTA_SITE = http://downloads.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 -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) \