libcap-2.20-build-system.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
  2. Also install the shared lib +x
  3. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  4. diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules
  5. --- libcap-2.20/Make.Rules 2011-01-19 02:06:44.000000000 -0300
  6. +++ libcap-2.20-build/Make.Rules 2011-04-19 14:07:53.544903094 -0300
  7. @@ -47,25 +47,25 @@
  8. KERNEL_HEADERS := $(topdir)/libcap/include
  9. IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  10. -CC := gcc
  11. -CFLAGS := -O2
  12. -BUILD_CC := $(CC)
  13. -BUILD_CFLAGS := $(CFLAGS) $(IPATH)
  14. -AR := ar
  15. -RANLIB := ranlib
  16. +CC ?= gcc
  17. +CFLAGS ?= -O2
  18. +BUILD_CC ?= $(CC)
  19. +BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
  20. +AR ?= ar
  21. +RANLIB ?= ranlib
  22. DEBUG = -g #-DDEBUG
  23. WARNINGS=-Wall -Wwrite-strings \
  24. -Wpointer-arith -Wcast-qual -Wcast-align \
  25. -Wstrict-prototypes -Wmissing-prototypes \
  26. -Wnested-externs -Winline -Wshadow
  27. LD=$(CC) -Wl,-x -shared
  28. -LDFLAGS := #-g
  29. +LDFLAGS ?= #-g
  30. SYSTEM_HEADERS = /usr/include
  31. INCS=$(topdir)/libcap/include/sys/capability.h
  32. LDFLAGS += -L$(topdir)/libcap
  33. CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
  34. -PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
  35. +PAM_CAP = no
  36. INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  37. DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
  38. LIBATTR := yes
  39. diff -Nura libcap-2.20/libcap/Makefile libcap-2.20-build/libcap/Makefile
  40. --- libcap-2.20/libcap/Makefile 2010-08-08 19:26:04.000000000 -0300
  41. +++ libcap-2.20-build/libcap/Makefile 2011-04-19 14:08:29.377146094 -0300
  42. @@ -65,7 +65,7 @@
  43. install -m 0644 include/sys/capability.h $(INCDIR)/sys
  44. mkdir -p -m 0755 $(LIBDIR)
  45. install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
  46. - install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
  47. + install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
  48. ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
  49. ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
  50. ifeq ($(FAKEROOT),)