| 1 |
vapier 11/09/02 17:41:30 |
| 2 |
|
| 3 |
Added: keyutils-1.5.3-makefile-fixup.patch |
| 4 |
Log: |
| 5 |
Version bump #381467 by teidakankan. Fixes rpath issues #328467 by William Throwe and multilib issues #339173 by Matt McAdoo. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: keyutils-1.5.3-makefile-fixup.patch |
| 16 |
=================================================================== |
| 17 |
From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001 |
| 18 |
From: Mike Frysinger <vapier@g.o> |
| 19 |
Date: Fri, 2 Sep 2011 13:30:30 -0400 |
| 20 |
Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils |
| 21 |
|
| 22 |
--- |
| 23 |
Makefile | 6 +++--- |
| 24 |
1 files changed, 3 insertions(+), 3 deletions(-) |
| 25 |
|
| 26 |
diff --git a/Makefile b/Makefile |
| 27 |
index 9e3fa9b..46695d1 100644 |
| 28 |
--- a/Makefile |
| 29 |
+++ b/Makefile |
| 30 |
@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makefile |
| 31 |
%.o: %.c keyutils.h Makefile |
| 32 |
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< |
| 33 |
|
| 34 |
-keyctl: keyctl.o -lkeyutils |
| 35 |
+keyctl: keyctl.o $(DEVELLIB) |
| 36 |
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils |
| 37 |
|
| 38 |
-request-key: request-key.o -lkeyutils |
| 39 |
+request-key: request-key.o $(DEVELLIB) |
| 40 |
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils |
| 41 |
|
| 42 |
-key.dns_resolver: key.dns_resolver.o -lkeyutils |
| 43 |
+key.dns_resolver: key.dns_resolver.o $(DEVELLIB) |
| 44 |
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv |
| 45 |
|
| 46 |
############################################################################### |
| 47 |
@@ -91,7 +91,7 @@ |
| 48 |
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) |
| 49 |
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) |
| 50 |
mkdir -p $(DESTDIR)$(USRLIBDIR) |
| 51 |
- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) |
| 52 |
+ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB) |
| 53 |
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl |
| 54 |
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key |
| 55 |
$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh |
| 56 |
-- |
| 57 |
1.7.6 |
Archives