123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 |
- Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
- Also install the shared lib +x
- Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
- diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules
- --- libcap-2.20/Make.Rules 2011-01-19 02:06:44.000000000 -0300
- +++ libcap-2.20-build/Make.Rules 2011-04-19 14:07:53.544903094 -0300
- @@ -47,25 +47,25 @@
- KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
-
- -CC := gcc
- -CFLAGS := -O2
- -BUILD_CC := $(CC)
- -BUILD_CFLAGS := $(CFLAGS) $(IPATH)
- -AR := ar
- -RANLIB := ranlib
- +CC ?= gcc
- +CFLAGS ?= -O2
- +BUILD_CC ?= $(CC)
- +BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
- +AR ?= ar
- +RANLIB ?= ranlib
- DEBUG = -g #-DDEBUG
- WARNINGS=-Wall -Wwrite-strings \
- -Wpointer-arith -Wcast-qual -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes \
- -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
- -LDFLAGS := #-g
- +LDFLAGS ?= #-g
-
- SYSTEM_HEADERS = /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
- 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)
- +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
- diff -Nura libcap-2.20/libcap/Makefile libcap-2.20-build/libcap/Makefile
- --- libcap-2.20/libcap/Makefile 2010-08-08 19:26:04.000000000 -0300
- +++ libcap-2.20-build/libcap/Makefile 2011-04-19 14:08:29.377146094 -0300
- @@ -65,7 +65,7 @@
- install -m 0644 include/sys/capability.h $(INCDIR)/sys
- mkdir -p -m 0755 $(LIBDIR)
- install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
- - install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- + install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
- ifeq ($(FAKEROOT),)
|