diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-08 16:32:10 +0100 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-08 16:32:10 +0100 |
commit | c82dab24ed58a919a52fa121e064c6125ceb803a (patch) | |
tree | 332589941f88c998e0830b21de28868835834883 /package/libcap/patches | |
parent | 7082351401b76e6ae4638333a15a3b844ad87985 (diff) |
fix cross-compile on Darwin
Diffstat (limited to 'package/libcap/patches')
-rw-r--r-- | package/libcap/patches/patch-Make_Rules | 12 | ||||
-rw-r--r-- | package/libcap/patches/patch-libcap_Makefile | 2 | ||||
-rw-r--r-- | package/libcap/patches/patch-pam_cap_Makefile | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules index 95bd663d9..09f31b3b4 100644 --- a/package/libcap/patches/patch-Make_Rules +++ b/package/libcap/patches/patch-Make_Rules @@ -1,5 +1,5 @@ --- libcap-2.22.orig/Make.Rules 2011-07-25 04:18:23.000000000 +0200 -+++ libcap-2.22/Make.Rules 2013-10-28 11:38:54.000000000 +0100 ++++ libcap-2.22/Make.Rules 2013-11-08 16:22:41.000000000 +0100 @@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR) # These choices are motivated by the fact that getcap and setcap are # administrative operations that could be needed to recover a system. @@ -29,7 +29,7 @@ # common defines for libcap LIBTITLE=libcap -@@ -47,8 +43,9 @@ MINOR=22 +@@ -47,12 +43,13 @@ MINOR=22 KERNEL_HEADERS := $(topdir)/libcap/include IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) @@ -40,7 +40,13 @@ +CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 BUILD_CC := $(CC) BUILD_CFLAGS := $(CFLAGS) $(IPATH) - AR := ar +-AR := ar +-RANLIB := ranlib ++AR ?= ar ++RANLIB ?= ranlib + DEBUG = -g #-DDEBUG + WARNINGS=-Wall -Wwrite-strings \ + -Wpointer-arith -Wcast-qual -Wcast-align \ @@ -64,11 +61,11 @@ LDFLAGS := #-g SYSTEM_HEADERS = /usr/include INCS=$(topdir)/libcap/include/sys/capability.h diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile index 034353ad5..f45b642c9 100644 --- a/package/libcap/patches/patch-libcap_Makefile +++ b/package/libcap/patches/patch-libcap_Makefile @@ -5,7 +5,7 @@ _makenames: _makenames.c cap_names.list.h - $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ ++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ cap_names.h: _makenames ./_makenames > cap_names.h diff --git a/package/libcap/patches/patch-pam_cap_Makefile b/package/libcap/patches/patch-pam_cap_Makefile new file mode 100644 index 000000000..5608fece5 --- /dev/null +++ b/package/libcap/patches/patch-pam_cap_Makefile @@ -0,0 +1,10 @@ +--- libcap-2.22.orig/pam_cap/Makefile 2010-08-09 02:08:01.000000000 +0200 ++++ libcap-2.22/pam_cap/Makefile 2013-11-08 16:29:05.000000000 +0100 +@@ -10,7 +10,6 @@ include ../Make.Rules + LDLIBS += -L../libcap -lcap + + all: pam_cap.so +- $(MAKE) testcompile + + install: all + mkdir -p -m 0755 $(LIBDIR)/security |