aboutsummaryrefslogtreecommitdiff
path: root/package/libcap/libcap.mk
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2016-03-16 21:20:08 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2016-03-16 22:58:01 +0100
commit5d8926add5da1b0bdfb90a41f4d7f857864c5524 (patch)
treece3e1a5376bc7019f583f5e54cb9259a39ad6f49 /package/libcap/libcap.mk
parent05506de0ad4665f7dd913eb7bc4e6a7ccbb12063 (diff)
downloadbuildroot-5d8926add5da1b0bdfb90a41f4d7f857864c5524.tar.gz
buildroot-5d8926add5da1b0bdfb90a41f4d7f857864c5524.tar.bz2
libcap: bump version
attr is no longer a dependency, not even optional. Refresh our patches, and drop the backport from upstream. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libcap/libcap.mk')
-rw-r--r--package/libcap/libcap.mk18
1 files changed, 5 insertions, 13 deletions
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 8625139299..bcb5d8cedb 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -4,23 +4,16 @@
#
################################################################################
-LIBCAP_VERSION = 2.24
+LIBCAP_VERSION = 2.25
LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
LIBCAP_LICENSE = GPLv2 or BSD-3c
LIBCAP_LICENSE_FILES = License
-LIBCAP_DEPENDENCIES = host-libcap
+LIBCAP_DEPENDENCIES = host-libcap host-gperf
LIBCAP_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_ATTR),y)
-LIBCAP_DEPENDENCIES += attr
-LIBCAP_HAVE_LIBATTR = yes
-else
-LIBCAP_HAVE_LIBATTR = no
-endif
-
-HOST_LIBCAP_DEPENDENCIES = host-attr
+HOST_LIBCAP_DEPENDENCIES = host-gperf
ifeq ($(BR2_STATIC_LIBS),y)
LIBCAP_MAKE_TARGET = libcap.a libcap.pc
@@ -31,7 +24,6 @@ LIBCAP_MAKE_INSTALL_TARGET = install
endif
LIBCAP_MAKE_FLAGS = \
- LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
BUILD_CC="$(HOSTCC)" \
BUILD_CFLAGS="$(HOST_CFLAGS)"
@@ -67,12 +59,12 @@ endef
define HOST_LIBCAP_BUILD_CMDS
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\
- LIBATTR=yes RAISE_SETFCAP=no
+ RAISE_SETFCAP=no
endef
define HOST_LIBCAP_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \
- LIBATTR=yes RAISE_SETFCAP=no prefix=/usr lib=lib install
+ RAISE_SETFCAP=no prefix=/usr lib=lib install
endef
$(eval $(generic-package))