aboutsummaryrefslogtreecommitdiff
path: root/package/libcap/libcap.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/libcap/libcap.mk')
-rw-r--r--package/libcap/libcap.mk28
1 files changed, 18 insertions, 10 deletions
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 6f1bb8a07f..27a295cad7 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBCAP_VERSION = 2.42
+LIBCAP_VERSION = 2.46
LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause
@@ -16,9 +16,13 @@ LIBCAP_INSTALL_STAGING = YES
HOST_LIBCAP_DEPENDENCIES = host-gperf
LIBCAP_MAKE_FLAGS = \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
BUILD_CC="$(HOSTCC)" \
BUILD_CFLAGS="$(HOST_CFLAGS)" \
- DYNAMIC=$(if $(BR2_STATIC_LIBS),,yes)
+ lib=lib \
+ prefix=/usr \
+ SHARED=$(if $(BR2_STATIC_LIBS),,yes) \
+ PTHREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,)
LIBCAP_MAKE_DIRS = libcap
@@ -36,27 +40,31 @@ endef
define LIBCAP_INSTALL_STAGING_CMDS
$(foreach d,$(LIBCAP_MAKE_DIRS), \
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \
- DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
+ DESTDIR=$(STAGING_DIR) install
)
endef
define LIBCAP_INSTALL_TARGET_CMDS
$(foreach d,$(LIBCAP_MAKE_DIRS), \
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \
- DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
+ DESTDIR=$(TARGET_DIR) install
)
endef
+HOST_LIBCAP_MAKE_FLAGS = \
+ DYNAMIC=yes \
+ GOLANG=no \
+ lib=lib \
+ prefix=$(HOST_DIR) \
+ RAISE_SETFCAP=no
+
define HOST_LIBCAP_BUILD_CMDS
- $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\
- DYNAMIC=yes \
- RAISE_SETFCAP=no GOLANG=no
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+ $(HOST_LIBCAP_MAKE_FLAGS)
endef
define HOST_LIBCAP_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) \
- DYNAMIC=yes \
- RAISE_SETFCAP=no GOLANG=no lib=lib install
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBCAP_MAKE_FLAGS) install
endef
$(eval $(generic-package))