diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-02 17:41:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-02 17:41:30 +0000 |
| commit | d88376c81fbdc3093134a4fb4eee06c83334bd11 (patch) | |
| tree | 5697c8a0dc26e57fa635d1065399815efe581cd8 /sys-apps/keyutils/files | |
| parent | media-gfx/gimp: Apply file-uri patch by upstream (bug #372941) (diff) | |
| download | gentoo-2-d88376c81fbdc3093134a4fb4eee06c83334bd11.tar.gz gentoo-2-d88376c81fbdc3093134a4fb4eee06c83334bd11.tar.bz2 gentoo-2-d88376c81fbdc3093134a4fb4eee06c83334bd11.zip | |
Version bump #381467 by teidakankan. Fixes rpath issues #328467 by William Throwe and multilib issues #339173 by Matt McAdoo.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/keyutils/files')
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch new file mode 100644 index 000000000000..b0e8add18488 --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch @@ -0,0 +1,42 @@ +From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Fri, 2 Sep 2011 13:30:30 -0400 +Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils + +--- + Makefile | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 9e3fa9b..46695d1 100644 +--- a/Makefile ++++ b/Makefile +@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makefile + %.o: %.c keyutils.h Makefile + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< + +-keyctl: keyctl.o -lkeyutils ++keyctl: keyctl.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-request-key: request-key.o -lkeyutils ++request-key: request-key.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-key.dns_resolver: key.dns_resolver.o -lkeyutils ++key.dns_resolver: key.dns_resolver.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv + + ############################################################################### +@@ -91,7 +91,7 @@ + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$(USRLIBDIR) +- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB) + $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl + $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key + $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh +-- +1.7.6 + |