| Message ID | 1363690308-29680-1-git-send-email-markos.chandras@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
>>>>> "Markos" == Markos Chandras <markos.chandras@gmail.com> writes:
Markos> From: Markos Chandras <markos.chandras@imgtec.com>
Markos> libcap can optionally link to libattr to support extra
Markos> file capabilities. Link to this library and pull it as
Markos> dependency if BR2_PACKAGE_ATTR is selected.
Markos> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Markos> ---
Markos> package/libcap/libcap.mk | 13 ++++++++++---
Markos> 1 files changed, 10 insertions(+), 3 deletions(-)
Markos> diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
Markos> index dcd3a18..87d5b85 100644
Markos> --- a/package/libcap/libcap.mk
Markos> +++ b/package/libcap/libcap.mk
Markos> @@ -15,18 +15,25 @@ LIBCAP_LICENSE_FILES = License
Markos> LIBCAP_DEPENDENCIES = host-libcap
Markos> LIBCAP_INSTALL_STAGING = YES
Markos> +ifeq ($(BR2_PACKAGE_ATTR),y)
Markos> + LIBCAP_DEPENDENCIES += attr
Markos> + HAVE_LIBATTR = yes
Markos> +else
Markos> + HAVE_LIBATTR = no
Markos> +endif
Buildroot uses a global namespace, so I renamed this to
LIBCAP_HAVE_LIBATTR and committed, thanks.
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index dcd3a18..87d5b85 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 += 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