mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
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>
This commit is contained in:
committed by
Peter Korsgaard
parent
05506de0ad
commit
5d8926add5
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user