patch-Make_Rules 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. --- libcap-2.25.orig/Make.Rules 2016-01-31 02:14:53.000000000 +0100
  2. +++ libcap-2.25/Make.Rules 2016-11-21 12:54:45.000000000 +0100
  3. @@ -13,21 +13,14 @@ FAKEROOT=$(DESTDIR)
  4. # administrative operations that could be needed to recover a system.
  5. ifndef lib
  6. -lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2)
  7. +lib=lib
  8. endif
  9. -ifdef prefix
  10. -exec_prefix=$(prefix)
  11. -lib_prefix=$(exec_prefix)
  12. -inc_prefix=$(lib_prefix)
  13. -man_prefix=$(prefix)/share
  14. -else
  15. prefix=/usr
  16. -exec_prefix=
  17. +exec_prefix=$(prefix)
  18. lib_prefix=$(exec_prefix)
  19. inc_prefix=$(prefix)
  20. man_prefix=$(prefix)/share
  21. -endif
  22. # Target directories
  23. @@ -48,10 +41,10 @@ MINOR=25
  24. KERNEL_HEADERS := $(topdir)/libcap/include/uapi
  25. IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
  26. -CC := gcc
  27. -CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  28. -BUILD_CC := $(CC)
  29. -BUILD_CFLAGS := $(CFLAGS) $(IPATH)
  30. +CC ?= gcc
  31. +CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  32. +BUILD_CC := $(CC_FOR_BUILD)
  33. +BUILD_CFLAGS := $(CFLAGS_FOR_BUILD) $(IPATH)
  34. AR := ar
  35. RANLIB := ranlib
  36. DEBUG = -g #-DDEBUG
  37. @@ -68,7 +61,7 @@ INCS=$(topdir)/libcap/include/sys/capabi
  38. LDFLAGS += -L$(topdir)/libcap
  39. CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
  40. PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
  41. -INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  42. +#INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  43. DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
  44. # When installing setcap, set its inheritable bit to be able to place