| 1 |
radhermit 12/08/24 21:59:07 |
| 2 |
|
| 3 |
Modified: canlock-2b-make.patch |
| 4 |
Log: |
| 5 |
Respect cflags and ldflags (bug #432622). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-libs/canlock/files/canlock-2b-make.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: canlock-2b-make.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- canlock-2b-make.patch 30 Sep 2011 10:05:17 -0000 1.1 |
| 23 |
+++ canlock-2b-make.patch 24 Aug 2012 21:59:07 -0000 1.2 |
| 24 |
@@ -1,5 +1,13 @@ |
| 25 |
--- canlock2b.orig/Makefile |
| 26 |
+++ canlock2b/Makefile |
| 27 |
+@@ -1,5 +1,5 @@ |
| 28 |
+-CFLAGS = -Iinclude |
| 29 |
+-LDFLAGS = -L. -lcanlock |
| 30 |
++CFLAGS += -Iinclude |
| 31 |
++LDFLAGS += -L. -lcanlock |
| 32 |
+ CC = gcc |
| 33 |
+ STATIC_LIB = libcanlock.a |
| 34 |
+ |
| 35 |
@@ -15,16 +15,17 @@ |
| 36 |
$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) |
| 37 |
|
| 38 |
@@ -23,7 +31,16 @@ |
| 39 |
test: all |
| 40 |
--- canlock2b.orig/src/Makefile |
| 41 |
+++ canlock2b/src/Makefile |
| 42 |
-@@ -13,8 +13,8 @@ |
| 43 |
+@@ -1,7 +1,7 @@ |
| 44 |
+ LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo |
| 45 |
+ CC = gcc |
| 46 |
+ LIBTOOL = libtool |
| 47 |
+-CFLAGS = -I../include |
| 48 |
++CFLAGS += -I../include |
| 49 |
+ SOURCES = base64.c canlock.c hmac_sha1.c sha1.c |
| 50 |
+ OBJS = base64.o canlock.o hmac_sha1.o sha1.o |
| 51 |
+ SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2 |
| 52 |
+@@ -13,20 +13,20 @@ |
| 53 |
|
| 54 |
libcanlock.a: |
| 55 |
$(CC) $(CFLAGS) -c $(SOURCES) |
| 56 |
@@ -34,7 +51,12 @@ |
| 57 |
rm $(OBJS) |
| 58 |
|
| 59 |
libcanlock.so.2.0.0: |
| 60 |
-@@ -26,7 +26,7 @@ |
| 61 |
+ $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) |
| 62 |
+- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 |
| 63 |
++ $(CC) -shared $(OBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 |
| 64 |
+ |
| 65 |
+ install: all |
| 66 |
+ $(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib |
| 67 |
cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2 |
| 68 |
cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so |
| 69 |
$(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a |
Archives