From patchwork Fri Mar 15 16:22:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 228086 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 C66C32C007A for ; Sat, 16 Mar 2013 03:23:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9793DA02CD; Fri, 15 Mar 2013 16:23:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ueUsJjkVd48Y; Fri, 15 Mar 2013 16:23:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5FE5FA02BD; Fri, 15 Mar 2013 16:23:10 +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 E8FBA8F74B for ; Fri, 15 Mar 2013 16:23:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EEA08CDAA for ; Fri, 15 Mar 2013 16:23:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ajzlGUS4WIy7 for ; Fri, 15 Mar 2013 16:23:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 31F548D00E for ; Fri, 15 Mar 2013 16:23:04 +0000 (UTC) From: Markos Chandras To: Date: Fri, 15 Mar 2013 16:22:38 +0000 Message-ID: <1363364558-5321-1-git-send-email-markos.chandras@gmail.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01181__2013_03_15_16_23_01 Subject: [Buildroot] [PATCH] libcap: Add optional support for libattr capabilities 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Markos Chandras libcap can optionally link to libattr to support extra file capabilities. Link to this library and pull it as dependency if BR2_PACKAGE_ATTR is selected. Signed-off-by: Markos Chandras --- package/libcap/libcap.mk | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index dcd3a18..c319335 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -15,18 +15,25 @@ LIBCAP_LICENSE_FILES = License LIBCAP_DEPENDENCIES = host-libcap LIBCAP_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_ATTR),y) + LIBCAP_DEPENDENCIES += host-attr attr + HAVE_LIBATTR = yes +else + HAVE_LIBATTR = no +endif + define LIBCAP_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - LIBATTR=no BUILD_CC="$(HOSTCC)" BUILD_CFLAGS="$(HOST_CFLAGS)" + LIBATTR=$(HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" BUILD_CFLAGS="$(HOST_CFLAGS)" endef define LIBCAP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(HAVE_LIBATTR) DESTDIR=$(STAGING_DIR) \ prefix=/usr lib=lib install endef define LIBCAP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(HAVE_LIBATTR) DESTDIR=$(TARGET_DIR) \ prefix=/usr lib=lib install endef @@ -38,11 +45,11 @@ endef LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS define HOST_LIBCAP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=$(HAVE_LIBATTR) endef define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) \ + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(HAVE_LIBATTR) DESTDIR=$(HOST_DIR) \ prefix=/usr lib=lib install endef