| 1 |
radhermit 13/03/06 07:13:29 |
| 2 |
|
| 3 |
Modified: canlock-2b-make.patch |
| 4 |
Log: |
| 5 |
Fix linking issue (bug #446746). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 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.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?r1=1.2&r2=1.3 |
| 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.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- canlock-2b-make.patch 24 Aug 2012 21:59:07 -0000 1.2 |
| 23 |
+++ canlock-2b-make.patch 6 Mar 2013 07:13:28 -0000 1.3 |
| 24 |
@@ -1,21 +1,40 @@ |
| 25 |
---- canlock2b.orig/Makefile |
| 26 |
+--- canlock2b/Makefile |
| 27 |
+++ canlock2b/Makefile |
| 28 |
-@@ -1,5 +1,5 @@ |
| 29 |
+@@ -1,33 +1,35 @@ |
| 30 |
-CFLAGS = -Iinclude |
| 31 |
-LDFLAGS = -L. -lcanlock |
| 32 |
+CFLAGS += -Iinclude |
| 33 |
-+LDFLAGS += -L. -lcanlock |
| 34 |
++LIBS = -L. -lcanlock |
| 35 |
CC = gcc |
| 36 |
- STATIC_LIB = libcanlock.a |
| 37 |
+-STATIC_LIB = libcanlock.a |
| 38 |
|
| 39 |
-@@ -15,16 +15,17 @@ |
| 40 |
- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) |
| 41 |
+-all: hmactest canlocktest $(STATIC_LIB) |
| 42 |
++all: shared static |
| 43 |
|
| 44 |
- $(STATIC_LIB): |
| 45 |
+-sha1test: t/sha1test.c $(STATIC_LIB) |
| 46 |
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) |
| 47 |
++sha1test: t/sha1test.c shared |
| 48 |
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS) |
| 49 |
+ |
| 50 |
+-hmactest: t/hmactest.c $(STATIC_LIB) |
| 51 |
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) |
| 52 |
++hmactest: t/hmactest.c shared |
| 53 |
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS) |
| 54 |
+ |
| 55 |
+-canlocktest: t/canlocktest.c $(STATIC_LIB) |
| 56 |
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) |
| 57 |
++canlocktest: t/canlocktest.c shared |
| 58 |
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS) |
| 59 |
+ |
| 60 |
+-$(STATIC_LIB): |
| 61 |
- cd src && make |
| 62 |
-+ cd src && $(MAKE) libcanlock.so.2.0.0 |
| 63 |
+- ln -s src/libcanlock.a libcanlock.a |
| 64 |
++static: |
| 65 |
+ cd src && $(MAKE) libcanlock.a |
| 66 |
- ln -s src/libcanlock.a libcanlock.a |
| 67 |
++ ln -sf src/libcanlock.a libcanlock.a |
| 68 |
++ |
| 69 |
++shared: |
| 70 |
++ cd src && $(MAKE) libcanlock.so.2.0.0 |
| 71 |
|
| 72 |
clean: |
| 73 |
rm -f src/*.o t/*.o t/*.out *.gmon gmon.* |
| 74 |
@@ -27,33 +46,55 @@ |
| 75 |
- cd src && make install DESTDIR=$(DESTDIR) |
| 76 |
+ cd src && $(MAKE) install DESTDIR=$(DESTDIR) |
| 77 |
install --mode=644 include/canlock.h $(DESTDIR)/usr/include |
| 78 |
- |
| 79 |
- test: all |
| 80 |
---- canlock2b.orig/src/Makefile |
| 81 |
+- |
| 82 |
+-test: all |
| 83 |
++ |
| 84 |
++test: hmactest canlocktest |
| 85 |
+ @echo "hmactest: " |
| 86 |
+ @./hmactest > t/hmactest.out || echo hmm |
| 87 |
+ @diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1) |
| 88 |
+--- canlock2b/src/Makefile |
| 89 |
+++ canlock2b/src/Makefile |
| 90 |
-@@ -1,7 +1,7 @@ |
| 91 |
- LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo |
| 92 |
+@@ -1,9 +1,11 @@ |
| 93 |
+-LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo |
| 94 |
CC = gcc |
| 95 |
++AR = ar |
| 96 |
++RANLIB = ranlib |
| 97 |
LIBTOOL = libtool |
| 98 |
-CFLAGS = -I../include |
| 99 |
+CFLAGS += -I../include |
| 100 |
SOURCES = base64.c canlock.c hmac_sha1.c sha1.c |
| 101 |
- OBJS = base64.o canlock.o hmac_sha1.o sha1.o |
| 102 |
+-OBJS = base64.o canlock.o hmac_sha1.o sha1.o |
| 103 |
++OBJS := $(SOURCES:.c=.o) |
| 104 |
++LIBOBJS := $(SOURCES:.c=.lo) |
| 105 |
SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2 |
| 106 |
-@@ -13,20 +13,20 @@ |
| 107 |
+ SHAREDFLAGS = -fPIC -DPIC |
| 108 |
+ LIBS = libcanlock.a libcanlock.so.2.0.0 |
| 109 |
+@@ -11,22 +13,25 @@ |
| 110 |
+ |
| 111 |
+ all: $(LIBS) |
| 112 |
|
| 113 |
- libcanlock.a: |
| 114 |
- $(CC) $(CFLAGS) -c $(SOURCES) |
| 115 |
+-libcanlock.a: |
| 116 |
+- $(CC) $(CFLAGS) -c $(SOURCES) |
| 117 |
- ar cru libcanlock.a $(OBJS) |
| 118 |
- ranlib libcanlock.a |
| 119 |
+- rm $(OBJS) |
| 120 |
+- |
| 121 |
+-libcanlock.so.2.0.0: |
| 122 |
+- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) |
| 123 |
+- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 |
| 124 |
++%.o: %.c |
| 125 |
++ $(CC) $(CFLAGS) -c -o $@ $< |
| 126 |
++ |
| 127 |
++%.lo: %.c |
| 128 |
++ $(CC) $(CFLAGS) $(SHAREDFLAGS) -c -o $@ $< |
| 129 |
++ |
| 130 |
++libcanlock.a: $(OBJS) |
| 131 |
+ $(AR) cru libcanlock.a $(OBJS) |
| 132 |
+ $(RANLIB) libcanlock.a |
| 133 |
- rm $(OBJS) |
| 134 |
- |
| 135 |
- libcanlock.so.2.0.0: |
| 136 |
- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) |
| 137 |
-- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 |
| 138 |
-+ $(CC) -shared $(OBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 |
| 139 |
++ |
| 140 |
++libcanlock.so.2.0.0: $(LIBOBJS) |
| 141 |
++ $(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 |
| 142 |
|
| 143 |
install: all |
| 144 |
$(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib |
| 145 |
@@ -61,7 +102,9 @@ |
| 146 |
cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so |
| 147 |
$(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a |
| 148 |
- ranlib $(DESTDIR)/usr/lib/libcanlock.a |
| 149 |
+- |
| 150 |
+ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a |
| 151 |
- |
| 152 |
++ |
| 153 |
clean: |
| 154 |
- rm -f $(OBJS) $(LIBS) |
| 155 |
+- rm -f $(OBJS) $(LIBS) |
| 156 |
++ rm -f $(OBJS) $(LIBOBJS) $(LIBS) |
Archives