projects / packages / libcap.git / blame
| Commit | Line | Data |
|---|---|---|
| 80d1b954 AM |
1 | --- libcap/Make.Rules~ 2008-07-10 08:22:22.000000000 +0200 |
| 2 | +++ libcap/Make.Rules 2008-07-27 11:50:06.884836635 +0200 | |
| 3 | @@ -43,7 +43,7 @@ | |
| 4 | # Compilation specifics | |
| 5 | ||
| 6 | CC := gcc | |
| 7 | -CFLAGS := -O2 | |
| 8 | +CFLAGS := $(OPT_CFLAGS) | |
| 9 | BUILD_CC := $(CC) | |
| 10 | BUILD_CFLAGS := $(CFLAGS) | |
| 11 | AR := ar | |
| 12 | @@ -54,7 +54,7 @@ | |
| 13 | -Wstrict-prototypes -Wmissing-prototypes \ | |
| 14 | -Wnested-externs -Winline -Wshadow | |
| 15 | LD=$(CC) -Wl,-x -shared | |
| 16 | -LDFLAGS := #-g | |
| 17 | +LDFLAGS := $(OPT_LDFLAGS) #-g | |
| 18 | ||
| 19 | KERNEL_HEADERS := $(topdir)/libcap/include | |
| 20 | SYSTEM_HEADERS = /usr/include | |
| d374b24d JB |
21 | --- libcap-2.06/libcap/Makefile.orig 2008-02-07 19:58:32.000000000 +0100 |
| 22 | +++ libcap-2.06/libcap/Makefile 2008-02-11 22:13:50.396611606 +0100 | |
| 23 | @@ -17,7 +17,6 @@ | |
| 56ee2246 JB |
24 | MAJLIBNAME=$(LIBNAME).$(VERSION) |
| 25 | MINLIBNAME=$(MAJLIBNAME).$(MINOR) | |
| d374b24d | 26 | GPERF_OUTPUT = _caps_output.gperf |
| 80d1b954 | 27 | -LDFLAGS += -lattr |
| 56ee2246 JB |
28 | |
| 29 | all: $(MINLIBNAME) $(STALIBNAME) | |
| 30 | ||
| 1592b46e | 31 | @@ -59,7 +58,7 @@ |
| 56ee2246 JB |
32 | install -m 0644 include/sys/capability.h $(INCDIR)/sys |
| 33 | mkdir -p -m 0755 $(LIBDIR) | |
| 80d1b954 | 34 | install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME) |
| 56ee2246 JB |
35 | - install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) |
| 36 | + install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) | |
| 37 | ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) | |
| 38 | ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME) | |
| 1592b46e | 39 | ifeq ($(FAKEROOT),) |
| 56ee2246 JB |
40 | --- libcap-2.05/pam_cap/Makefile.orig 2008-01-22 01:16:58.000000000 +0100 |
| 41 | +++ libcap-2.05/pam_cap/Makefile 2008-01-26 21:41:43.080250852 +0100 | |
| 42 | @@ -14,7 +14,7 @@ | |
| 80d1b954 | 43 | install -m 0755 pam_cap.so $(LIBDIR)/security |
| 56ee2246 JB |
44 | |
| 45 | pam_cap.so: pam_cap.o | |
| 80d1b954 AM |
46 | - $(LD) $(CFLAGS) -o pam_cap.so $< $(LDLIBS) |
| 47 | + $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) | |
| 56ee2246 JB |
48 | |
| 49 | pam_cap.o: pam_cap.c | |
| 50 | $(CC) $(CFLAGS) -c $< -o $@ | |
| 80d1b954 AM |
51 | --- libcap/progs/Makefile~ 2008-07-10 08:18:40.000000000 +0200 |
| 52 | +++ libcap/progs/Makefile 2008-07-27 11:48:59.681094184 +0200 | |
| 53 | @@ -6,7 +6,6 @@ | |
| 54 | # | |
| 55 | PROGS=getpcaps getcap setcap capsh | |
| 56ee2246 | 56 | |
| 80d1b954 AM |
57 | -LDFLAGS += --static |
| 58 | LDLIBS += -lcap | |
| 56ee2246 | 59 | |
| 80d1b954 | 60 | all: $(PROGS) |