From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 26 Jan 2008 21:05:49 +0000 (+0000)
Subject: - linking and install fixes
X-Git-Tag: auto/th/libcap-2_05-1~3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=56ee2246c8a01b1ecba8ce761233e9025361cf12;hp=4fecc0a132c50ba19d14eb18c3aa4f9afa323fc9;p=packages%2Flibcap.git

- linking and install fixes

Changed files:
    libcap-make.patch -> 1.1
---

diff --git a/libcap-make.patch b/libcap-make.patch
new file mode 100644
index 0000000..05bfc56
--- /dev/null
+++ b/libcap-make.patch
@@ -0,0 +1,53 @@
+--- libcap-2.05/libcap/Makefile.orig	2008-01-22 01:16:58.000000000 +0100
++++ libcap-2.05/libcap/Makefile	2008-01-26 21:43:10.285220380 +0100
+@@ -16,7 +16,6 @@
+ OBJS=$(addsuffix .o, $(FILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+-LDFLAGS+=-lattr
+ 
+ all: $(MINLIBNAME) $(STALIBNAME)
+ 
+@@ -48,10 +47,9 @@
+ 	install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ 	mkdir -p -m 0755 $(LIBDIR)
+ 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(MINLIBNAME)
+-	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
++	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
+-	-/sbin/ldconfig
+ 
+ clean:
+ 	$(LOCALCLEAN)
+--- 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 @@
+ 	@echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+ 
+ pam_cap.so: pam_cap.o
+-	$(LD) -o pam_cap.so $< $(LIBS)
++	$(LD) $(LDFLAGS) $(COPTFLAG) -o pam_cap.so $< $(LIBS)
+ 
+ pam_cap.o: pam_cap.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
+--- libcap-2.05/progs/Makefile.orig	2008-01-22 01:16:58.000000000 +0100
++++ libcap-2.05/progs/Makefile	2008-01-26 21:40:49.333187982 +0100
+@@ -9,7 +9,7 @@
+ all: $(PROGS)
+ 
+ $(PROGS): %: %.o
+-	$(CC) --static $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS)
++	$(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ %.o: %.c $(INCS)
+ 	$(CC) $(CFLAGS) -c $< -o $@
+@@ -17,7 +17,7 @@
+ install: all
+ 	mkdir -p -m 0755 $(SBINDIR)
+ 	for p in $(PROGS) ; do \
+-		install -s -m 0755 $$p $(SBINDIR) ; \
++		install -m 0755 $$p $(SBINDIR) ; \
+ 	done
+ 
+ clean: