diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-26 20:43:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-02 18:55:23 +0100 |
| commit | dac409cf8e7792d666138448e22eb7146d6c2a0c (patch) | |
| tree | 7e80aec31f6958f457d73abbb0800a74e672de3e /package/libcap/patches/patch-Make_Rules | |
| parent | 8e97e219a36a7dfa33eae5986e9ae650eaab244d (diff) | |
update to latest, fix build when static library build s choosen
Diffstat (limited to 'package/libcap/patches/patch-Make_Rules')
| -rw-r--r-- | package/libcap/patches/patch-Make_Rules | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules index 09f31b3b4..a6a637d3b 100644 --- a/package/libcap/patches/patch-Make_Rules +++ b/package/libcap/patches/patch-Make_Rules @@ -1,59 +1,61 @@ ---- libcap-2.22.orig/Make.Rules 2011-07-25 04:18:23.000000000 +0200 -+++ libcap-2.22/Make.Rules 2013-11-08 16:22:41.000000000 +0100 -@@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR) +--- libcap-2.24.orig/Make.Rules 2014-01-06 02:16:21.000000000 +0100 ++++ libcap-2.24/Make.Rules 2015-02-26 14:01:28.000000000 +0100 +@@ -12,22 +12,12 @@ FAKEROOT=$(DESTDIR) # These choices are motivated by the fact that getcap and setcap are # administrative operations that could be needed to recover a system. -ifndef lib --lib=$(shell ldd /usr/bin/ld|fgrep ld-linux|cut -d/ -f2) +-lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2) -endif - - ifdef prefix - exec_prefix=$(prefix) - lib_prefix=$(exec_prefix) -@@ -23,7 +19,7 @@ inc_prefix=$(lib_prefix) - man_prefix=$(prefix)/share - else +-ifdef prefix +-exec_prefix=$(prefix) +-lib_prefix=$(exec_prefix) +-inc_prefix=$(lib_prefix) +-man_prefix=$(prefix)/share +-else ++lib=lib prefix=/usr -exec_prefix= -+exec_prefix=/usr ++exec_prefix=$(prefix) lib_prefix=$(exec_prefix) inc_prefix=$(prefix) man_prefix=$(prefix)/share -@@ -34,7 +30,7 @@ endif - MANDIR=$(FAKEROOT)$(man_prefix)/man - SBINDIR=$(FAKEROOT)$(exec_prefix)/sbin - INCDIR=$(FAKEROOT)$(inc_prefix)/include --LIBDIR=$(FAKEROOT)$(lib_prefix)/$(lib) -+LIBDIR=$(FAKEROOT)$(lib_prefix)/lib +-endif - # common defines for libcap - LIBTITLE=libcap -@@ -47,12 +43,13 @@ MINOR=22 - KERNEL_HEADERS := $(topdir)/libcap/include - IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) + # Target directories + +@@ -48,28 +38,28 @@ MINOR=24 + 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 +CC ?= gcc -+CFLAGS ?= -O2 -+CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 BUILD_CC := $(CC) BUILD_CFLAGS := $(CFLAGS) $(IPATH) -AR := ar -RANLIB := ranlib +-DEBUG = -g #-DDEBUG +AR ?= ar +RANLIB ?= ranlib - DEBUG = -g #-DDEBUG ++DEBUG = WARNINGS=-Wall -Wwrite-strings \ -Wpointer-arith -Wcast-qual -Wcast-align \ -@@ -64,11 +61,11 @@ LDFLAGS := #-g + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -Wshadow +-LD=$(CC) -Wl,-x -shared +-LDFLAGS := #-g ++LD=$(CC) -shared ++LDFLAGS ?= #-g + SYSTEM_HEADERS = /usr/include INCS=$(topdir)/libcap/include/sys/capability.h LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CFLAGS += -Dlinux $(WARNINGS) - PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) + CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) +-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) ++PAM_CAP := no INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) -LIBATTR := yes |