Annotation of /trunk/libcap/patches/libcap-2.22-build-system-fixes.patch
Parent Directory
| 
Revision Log
Revision 1455 -
(hide annotations)
(download)
Thu Jul 28 18:06:34 2011 UTC (12 years, 10 months ago) by niro
File size: 4224 byte(s)
Thu Jul 28 18:06:34 2011 UTC (12 years, 10 months ago) by niro
File size: 4224 byte(s)
-re-diffed against 2.22
| 1 | niro | 1455 | diff -Naur libcap-2.22/Make.Rules libcap-2.22-magellan/Make.Rules |
| 2 | --- libcap-2.22/Make.Rules 2011-07-25 04:18:23.000000000 +0200 | ||
| 3 | +++ libcap-2.22-magellan/Make.Rules 2011-07-28 22:09:33.000000000 +0200 | ||
| 4 | @@ -44,27 +44,28 @@ | ||
| 5 | |||
| 6 | # Compilation specifics | ||
| 7 | |||
| 8 | -KERNEL_HEADERS := $(topdir)/libcap/include | ||
| 9 | -IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) | ||
| 10 | - | ||
| 11 | -CC := gcc | ||
| 12 | -CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 | ||
| 13 | +CC ?= gcc | ||
| 14 | +CFLAGS ?= -O2 | ||
| 15 | BUILD_CC := $(CC) | ||
| 16 | -BUILD_CFLAGS := $(CFLAGS) $(IPATH) | ||
| 17 | -AR := ar | ||
| 18 | -RANLIB := ranlib | ||
| 19 | +BUILD_CFLAGS := $(CFLAGS) | ||
| 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 | |||
| 31 | -SYSTEM_HEADERS = /usr/include | ||
| 32 | +KERNEL_HEADERS = $(topdir)/libcap/include | ||
| 33 | +LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) | ||
| 34 | +CPPFLAGS += $(LIBCAP_CPPFLAGS) | ||
| 35 | +BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) | ||
| 36 | INCS=$(topdir)/libcap/include/sys/capability.h | ||
| 37 | LDFLAGS += -L$(topdir)/libcap | ||
| 38 | -CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) | ||
| 39 | +CPPFLAGS += -Dlinux | ||
| 40 | +CFLAGS += $(WARNINGS) $(DEBUG) | ||
| 41 | PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; 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 | diff -Naur libcap-2.22/libcap/Makefile libcap-2.22-magellan/libcap/Makefile | ||
| 45 | --- libcap-2.22/libcap/Makefile 2010-08-09 00:26:04.000000000 +0200 | ||
| 46 | +++ libcap-2.22-magellan/libcap/Makefile 2011-07-28 22:10:36.000000000 +0200 | ||
| 47 | @@ -16,7 +16,7 @@ | ||
| 48 | # no support). | ||
| 49 | ifeq ($(LIBATTR),yes) | ||
| 50 | FILES += cap_file | ||
| 51 | -LDFLAGS += -lattr | ||
| 52 | +LDLIBS += -lattr | ||
| 53 | endif | ||
| 54 | |||
| 55 | INCLS=libcap.h cap_names.h $(INCS) | ||
| 56 | @@ -24,6 +24,7 @@ | ||
| 57 | MAJLIBNAME=$(LIBNAME).$(VERSION) | ||
| 58 | MINLIBNAME=$(MAJLIBNAME).$(MINOR) | ||
| 59 | GPERF_OUTPUT = _caps_output.gperf | ||
| 60 | +CFLAGS += -fPIC | ||
| 61 | |||
| 62 | all: $(MINLIBNAME) $(STALIBNAME) | ||
| 63 | |||
| 64 | @@ -33,7 +34,7 @@ | ||
| 65 | endif | ||
| 66 | |||
| 67 | _makenames: _makenames.c cap_names.list.h | ||
| 68 | - $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ | ||
| 69 | + $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ | ||
| 70 | |||
| 71 | cap_names.h: _makenames | ||
| 72 | ./_makenames > cap_names.h | ||
| 73 | @@ -50,15 +51,15 @@ | ||
| 74 | $(RANLIB) $@ | ||
| 75 | |||
| 76 | $(MINLIBNAME): $(OBJS) | ||
| 77 | - $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ | ||
| 78 | + $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS) | ||
| 79 | ln -sf $(MINLIBNAME) $(MAJLIBNAME) | ||
| 80 | ln -sf $(MAJLIBNAME) $(LIBNAME) | ||
| 81 | |||
| 82 | %.o: %.c $(INCLS) | ||
| 83 | - $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ | ||
| 84 | + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ | ||
| 85 | |||
| 86 | cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) | ||
| 87 | - $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ | ||
| 88 | + $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ | ||
| 89 | |||
| 90 | install: all | ||
| 91 | mkdir -p -m 0755 $(INCDIR)/sys | ||
| 92 | diff -Naur libcap-2.22/pam_cap/Makefile libcap-2.22-magellan/pam_cap/Makefile | ||
| 93 | --- libcap-2.22/pam_cap/Makefile 2010-08-09 02:08:01.000000000 +0200 | ||
| 94 | +++ libcap-2.22-magellan/pam_cap/Makefile 2011-07-28 22:10:36.000000000 +0200 | ||
| 95 | @@ -9,6 +9,8 @@ | ||
| 96 | # written (and you know why it fails), email me and explain why. Thanks! | ||
| 97 | LDLIBS += -L../libcap -lcap | ||
| 98 | |||
| 99 | +CFLAGS += -fPIC | ||
| 100 | + | ||
| 101 | all: pam_cap.so | ||
| 102 | $(MAKE) testcompile | ||
| 103 | |||
| 104 | @@ -17,13 +19,13 @@ | ||
| 105 | install -m 0755 pam_cap.so $(LIBDIR)/security | ||
| 106 | |||
| 107 | pam_cap.so: pam_cap.o | ||
| 108 | - $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) | ||
| 109 | + $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) | ||
| 110 | |||
| 111 | pam_cap.o: pam_cap.c | ||
| 112 | - $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ | ||
| 113 | + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ | ||
| 114 | |||
| 115 | testcompile: test.c pam_cap.o | ||
| 116 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) | ||
| 117 | + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) | ||
| 118 | |||
| 119 | clean: | ||
| 120 | rm -f *.o *.so testcompile *~ | ||
| 121 | diff -Naur libcap-2.22/progs/Makefile libcap-2.22-magellan/progs/Makefile | ||
| 122 | --- libcap-2.22/progs/Makefile 2010-08-09 01:56:40.000000000 +0200 | ||
| 123 | +++ libcap-2.22-magellan/progs/Makefile 2011-07-28 22:10:36.000000000 +0200 | ||
| 124 | @@ -22,7 +22,7 @@ | ||
| 125 | $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) | ||
| 126 | |||
| 127 | %.o: %.c $(INCS) | ||
| 128 | - $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ | ||
| 129 | + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ | ||
| 130 | |||
| 131 | install: all | ||
| 132 | mkdir -p -m 0755 $(SBINDIR) |