- updated to 2.33

[packages/libcap.git] / libcap-make.patch

diff --git a/libcap-make.patch b/libcap-make.patch
index b36facaf9d602212f204eebfe3ed61f9598b1ecd..fbb5d7e22c8df0e0635441528ce71278989d9608 100644 (file)
--- a/libcap-make.patch
+++ b/libcap-make.patch
@@ -1,60 +1,20 @@
---- libcap/Make.Rules~ 2008-07-10 08:22:22.000000000 +0200
-+++ libcap/Make.Rules  2008-07-27 11:50:06.884836635 +0200
-@@ -43,7 +43,7 @@
- # Compilation specifics
- 
- CC := gcc
--CFLAGS := -O2
-+CFLAGS := $(OPT_CFLAGS)
+--- libcap-2.33/Make.Rules.orig        2020-03-02 00:12:15.000000000 +0100
++++ libcap-2.33/Make.Rules     2020-03-22 18:57:35.993134683 +0100
+@@ -50,7 +50,7 @@
+ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC := gcc # -std=c99
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS := $(OPT_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  BUILD_CC := $(CC)
- BUILD_CFLAGS := $(CFLAGS)
+ BUILD_CFLAGS := $(CFLAGS) $(IPATH)
  AR := ar
-@@ -54,7 +54,7 @@
+@@ -61,7 +61,7 @@
          -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline -Wshadow
  LD=$(CC) -Wl,-x -shared
 -LDFLAGS := #-g
 +LDFLAGS := $(OPT_LDFLAGS) #-g
+ LIBCAPLIB := -L$(topdir)/libcap -lcap
+ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
  
- KERNEL_HEADERS := $(topdir)/libcap/include
- SYSTEM_HEADERS = /usr/include
---- libcap-2.06/libcap/Makefile.orig   2008-02-07 19:58:32.000000000 +0100
-+++ libcap-2.06/libcap/Makefile        2008-02-11 22:13:50.396611606 +0100
-@@ -17,7 +17,6 @@
- MAJLIBNAME=$(LIBNAME).$(VERSION)
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
- GPERF_OUTPUT = _caps_output.gperf
--LDFLAGS += -lattr
- 
- all: $(MINLIBNAME) $(STALIBNAME)
- 
-@@ -59,7 +58,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),)
---- libcap-2.05/pam_cap/Makefile.orig  2008-01-22 01:16:58.000000000 +0100
-+++ libcap-2.05/pam_cap/Makefile       2008-01-26 21:41:43.080250852 +0100
-@@ -14,7 +14,7 @@
-       install -m 0755 pam_cap.so $(LIBDIR)/security
- 
- pam_cap.so: pam_cap.o
--      $(LD) $(CFLAGS) -o pam_cap.so $< $(LDLIBS)
-+      $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS)
- 
- pam_cap.o: pam_cap.c
-       $(CC) $(CFLAGS) -c $< -o $@
---- libcap/progs/Makefile~     2008-07-10 08:18:40.000000000 +0200
-+++ libcap/progs/Makefile      2008-07-27 11:48:59.681094184 +0200
-@@ -6,7 +6,6 @@
- #
- PROGS=getpcaps getcap setcap capsh
- 
--LDFLAGS += --static 
- LDLIBS += -lcap
- 
- all: $(PROGS)