diff options
Diffstat (limited to 'package/libcap')
| -rw-r--r-- | package/libcap/Makefile | 7 | ||||
| -rw-r--r-- | package/libcap/patches/patch-Make_Rules | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/package/libcap/Makefile b/package/libcap/Makefile index 53587d7f1..294cd2bd8 100644 --- a/package/libcap/Makefile +++ b/package/libcap/Makefile @@ -19,10 +19,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBCAP,libcap,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= manual +ifeq ($(OS_FOR_BUILD),Darwin) +HOST_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include +endif -# for Darwin hosts -CPPFLAGS_FOR_BUILD+= -I$(STAGING_TARGET_DIR)/usr/include +HOST_STYLE:= manual CONFIG_STYLE:= manual host-build: diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules index 4c909e150..fa587e654 100644 --- a/package/libcap/patches/patch-Make_Rules +++ b/package/libcap/patches/patch-Make_Rules @@ -1,5 +1,5 @@ --- libcap-2.25.orig/Make.Rules 2016-01-31 02:14:53.000000000 +0100 -+++ libcap-2.25/Make.Rules 2016-09-26 20:46:02.214228217 +0200 ++++ libcap-2.25/Make.Rules 2016-11-21 12:54:45.000000000 +0100 @@ -13,21 +13,14 @@ FAKEROOT=$(DESTDIR) # administrative operations that could be needed to recover a system. @@ -39,3 +39,12 @@ AR := ar RANLIB := ranlib DEBUG = -g #-DDEBUG +@@ -68,7 +61,7 @@ INCS=$(topdir)/libcap/include/sys/capabi + LDFLAGS += -L$(topdir)/libcap + CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) + PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) +-INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) ++#INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) + + # When installing setcap, set its inheritable bit to be able to place |