diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-08-24 21:59:07 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-08-24 21:59:07 +0000 |
| commit | db9a2174cce40086704681d884985d8a3ab5c2fa (patch) | |
| tree | 7d574db6b3488904b6099f7725c780fa0b50c998 /net-libs | |
| parent | Add patch from OpenSuSE to get rid of an implicit function declaration, bug 4... (diff) | |
| download | gentoo-2-db9a2174cce40086704681d884985d8a3ab5c2fa.tar.gz gentoo-2-db9a2174cce40086704681d884985d8a3ab5c2fa.tar.bz2 gentoo-2-db9a2174cce40086704681d884985d8a3ab5c2fa.zip | |
Respect cflags and ldflags (bug #432622).
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/canlock/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/canlock/files/canlock-2b-make.patch | 26 |
2 files changed, 29 insertions, 4 deletions
diff --git a/net-libs/canlock/ChangeLog b/net-libs/canlock/ChangeLog index 9437c59bc85e..761c64824c41 100644 --- a/net-libs/canlock/ChangeLog +++ b/net-libs/canlock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/canlock -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.3 2011/10/10 18:35:03 grobian Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.4 2012/08/24 21:59:07 radhermit Exp $ + + 24 Aug 2012; Tim Harder <radhermit@gentoo.org> files/canlock-2b-make.patch: + Respect cflags and ldflags (bug #432622). 10 Oct 2011; Fabian Groffen <grobian@gentoo.org> canlock-2b.ebuild: Marked ~{amd64,x86}-linux, bug #385065 diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch index 5ea34530cebd..4f26d25f7812 100644 --- a/net-libs/canlock/files/canlock-2b-make.patch +++ b/net-libs/canlock/files/canlock-2b-make.patch @@ -1,5 +1,13 @@ --- canlock2b.orig/Makefile +++ canlock2b/Makefile +@@ -1,5 +1,5 @@ +-CFLAGS = -Iinclude +-LDFLAGS = -L. -lcanlock ++CFLAGS += -Iinclude ++LDFLAGS += -L. -lcanlock + CC = gcc + STATIC_LIB = libcanlock.a + @@ -15,16 +15,17 @@ $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) @@ -23,7 +31,16 @@ test: all --- canlock2b.orig/src/Makefile +++ canlock2b/src/Makefile -@@ -13,8 +13,8 @@ +@@ -1,7 +1,7 @@ + LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo + CC = gcc + LIBTOOL = libtool +-CFLAGS = -I../include ++CFLAGS += -I../include + SOURCES = base64.c canlock.c hmac_sha1.c sha1.c + OBJS = base64.o canlock.o hmac_sha1.o sha1.o + SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2 +@@ -13,20 +13,20 @@ libcanlock.a: $(CC) $(CFLAGS) -c $(SOURCES) @@ -34,7 +51,12 @@ rm $(OBJS) libcanlock.so.2.0.0: -@@ -26,7 +26,7 @@ + $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) +- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 ++ $(CC) -shared $(OBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 + + install: all + $(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2 cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so $(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a |