libcap: fix target build

package/libcap/Makefile

@@ -25,14 +25,6 @@ HOST_STYLE:=		manual
 CPPFLAGS_FOR_BUILD+=	-I$(STAGING_TARGET_DIR)/usr/include
 CONFIG_STYLE:=		manual
 
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
-ALL_TARGET:=		static progs
-INSTALL_TARGET:=	install-static
-else
-ALL_TARGET:=		shared progs
-INSTALL_TARGET:=	install-shared
-endif
-
 host-build:
 	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) $(MAKE_TRACE)

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-23 10:37:16.179167139 +0200
++++ libcap-2.25/Make.Rules	2016-09-26 20:46:02.214228217 +0200
 @@ -13,21 +13,14 @@ FAKEROOT=$(DESTDIR)
  # administrative operations that could be needed to recover a system.
  
@@ -24,3 +24,18 @@
  
  # Target directories
  
+@@ -48,10 +41,10 @@ MINOR=25
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+-CC := gcc
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
++CC ?= gcc
++CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BUILD_CC := $(CC_FOR_BUILD)
++BUILD_CFLAGS := $(CFLAGS_FOR_BUILD) $(IPATH)
+ AR := ar
+ RANLIB := ranlib
+ DEBUG = -g #-DDEBUG

package/libcap/patches/patch-libcap_Makefile

@@ -1,8 +1,11 @@
 --- libcap-2.25.orig/libcap/Makefile	2016-01-31 01:01:41.000000000 +0100
-+++ libcap-2.25/libcap/Makefile	2016-09-23 10:34:12.564023450 +0200
-@@ -65,7 +65,6 @@ cap_text.o: cap_text.c $(USE_GPERF_OUTPU
++++ libcap-2.25/libcap/Makefile	2016-09-23 15:09:26.623578683 +0200
+@@ -63,9 +63,8 @@ cap_text.o: cap_text.c $(USE_GPERF_OUTPU
+ 	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
  install: all
- 	mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
+-	mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
++	mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys $(FAKEROOT)$(LIBDIR)
  	install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys
 -	mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR)
  	install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME)