* [gentoo-commits] gentoo-x86 commit in net-libs/canlock/files: canlock-2b-make.patch
@ 2011-09-30 10:05 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2011-09-30 10:05 UTC (permalink / raw
To: gentoo-commits
radhermit 11/09/30 10:05:17
Added: canlock-2b-make.patch
Log:
Initial import (bug #104244).
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Revision Changes Path
1.1 net-libs/canlock/files/canlock-2b-make.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.1&content-type=text/plain
Index: canlock-2b-make.patch
===================================================================
--- canlock2b.orig/Makefile
+++ canlock2b/Makefile
@@ -15,16 +15,17 @@
$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
$(STATIC_LIB):
- cd src && make
+ cd src && $(MAKE) libcanlock.so.2.0.0
+ cd src && $(MAKE) libcanlock.a
ln -s src/libcanlock.a libcanlock.a
clean:
rm -f src/*.o t/*.o t/*.out *.gmon gmon.*
- cd src && make clean
+ cd src && $(MAKE) clean
rm -f *.a canlocktest hmactest sha1test *.exe *.h lib-stamp
install: all
- cd src && make install DESTDIR=$(DESTDIR)
+ cd src && $(MAKE) install DESTDIR=$(DESTDIR)
install --mode=644 include/canlock.h $(DESTDIR)/usr/include
test: all
--- canlock2b.orig/src/Makefile
+++ canlock2b/src/Makefile
@@ -13,8 +13,8 @@
libcanlock.a:
$(CC) $(CFLAGS) -c $(SOURCES)
- ar cru libcanlock.a $(OBJS)
- ranlib libcanlock.a
+ $(AR) cru libcanlock.a $(OBJS)
+ $(RANLIB) libcanlock.a
rm $(OBJS)
libcanlock.so.2.0.0:
@@ -26,7 +26,7 @@
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
- ranlib $(DESTDIR)/usr/lib/libcanlock.a
+ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a
clean:
rm -f $(OBJS) $(LIBS)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-libs/canlock/files: canlock-2b-make.patch
@ 2012-08-24 21:59 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2012-08-24 21:59 UTC (permalink / raw
To: gentoo-commits
radhermit 12/08/24 21:59:07
Modified: canlock-2b-make.patch
Log:
Respect cflags and ldflags (bug #432622).
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Revision Changes Path
1.2 net-libs/canlock/files/canlock-2b-make.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?r1=1.1&r2=1.2
Index: canlock-2b-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- canlock-2b-make.patch 30 Sep 2011 10:05:17 -0000 1.1
+++ canlock-2b-make.patch 24 Aug 2012 21:59:07 -0000 1.2
@@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-libs/canlock/files: canlock-2b-make.patch
@ 2013-03-06 7:13 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2013-03-06 7:13 UTC (permalink / raw
To: gentoo-commits
radhermit 13/03/06 07:13:29
Modified: canlock-2b-make.patch
Log:
Fix linking issue (bug #446746).
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path
1.3 net-libs/canlock/files/canlock-2b-make.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch?r1=1.2&r2=1.3
Index: canlock-2b-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/files/canlock-2b-make.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- canlock-2b-make.patch 24 Aug 2012 21:59:07 -0000 1.2
+++ canlock-2b-make.patch 6 Mar 2013 07:13:28 -0000 1.3
@@ -1,21 +1,40 @@
---- canlock2b.orig/Makefile
+--- canlock2b/Makefile
+++ canlock2b/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,33 +1,35 @@
-CFLAGS = -Iinclude
-LDFLAGS = -L. -lcanlock
+CFLAGS += -Iinclude
-+LDFLAGS += -L. -lcanlock
++LIBS = -L. -lcanlock
CC = gcc
- STATIC_LIB = libcanlock.a
+-STATIC_LIB = libcanlock.a
-@@ -15,16 +15,17 @@
- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
+-all: hmactest canlocktest $(STATIC_LIB)
++all: shared static
- $(STATIC_LIB):
+-sha1test: t/sha1test.c $(STATIC_LIB)
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
++sha1test: t/sha1test.c shared
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
+
+-hmactest: t/hmactest.c $(STATIC_LIB)
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
++hmactest: t/hmactest.c shared
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
+
+-canlocktest: t/canlocktest.c $(STATIC_LIB)
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
++canlocktest: t/canlocktest.c shared
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
+
+-$(STATIC_LIB):
- cd src && make
-+ cd src && $(MAKE) libcanlock.so.2.0.0
+- ln -s src/libcanlock.a libcanlock.a
++static:
+ cd src && $(MAKE) libcanlock.a
- ln -s src/libcanlock.a libcanlock.a
++ ln -sf src/libcanlock.a libcanlock.a
++
++shared:
++ cd src && $(MAKE) libcanlock.so.2.0.0
clean:
rm -f src/*.o t/*.o t/*.out *.gmon gmon.*
@@ -27,33 +46,55 @@
- cd src && make install DESTDIR=$(DESTDIR)
+ cd src && $(MAKE) install DESTDIR=$(DESTDIR)
install --mode=644 include/canlock.h $(DESTDIR)/usr/include
-
- test: all
---- canlock2b.orig/src/Makefile
+-
+-test: all
++
++test: hmactest canlocktest
+ @echo "hmactest: "
+ @./hmactest > t/hmactest.out || echo hmm
+ @diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
+--- canlock2b/src/Makefile
+++ canlock2b/src/Makefile
-@@ -1,7 +1,7 @@
- LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
+@@ -1,9 +1,11 @@
+-LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
CC = gcc
++AR = ar
++RANLIB = ranlib
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
+-OBJS = base64.o canlock.o hmac_sha1.o sha1.o
++OBJS := $(SOURCES:.c=.o)
++LIBOBJS := $(SOURCES:.c=.lo)
SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2
-@@ -13,20 +13,20 @@
+ SHAREDFLAGS = -fPIC -DPIC
+ LIBS = libcanlock.a libcanlock.so.2.0.0
+@@ -11,22 +13,25 @@
+
+ all: $(LIBS)
- libcanlock.a:
- $(CC) $(CFLAGS) -c $(SOURCES)
+-libcanlock.a:
+- $(CC) $(CFLAGS) -c $(SOURCES)
- ar cru libcanlock.a $(OBJS)
- ranlib libcanlock.a
+- rm $(OBJS)
+-
+-libcanlock.so.2.0.0:
+- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES)
+- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
++%.o: %.c
++ $(CC) $(CFLAGS) -c -o $@ $<
++
++%.lo: %.c
++ $(CC) $(CFLAGS) $(SHAREDFLAGS) -c -o $@ $<
++
++libcanlock.a: $(OBJS)
+ $(AR) cru libcanlock.a $(OBJS)
+ $(RANLIB) libcanlock.a
- rm $(OBJS)
-
- libcanlock.so.2.0.0:
- $(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
++
++libcanlock.so.2.0.0: $(LIBOBJS)
++ $(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
install: all
$(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib
@@ -61,7 +102,9 @@
cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so
$(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a
- ranlib $(DESTDIR)/usr/lib/libcanlock.a
+-
+ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a
-
++
clean:
- rm -f $(OBJS) $(LIBS)
+- rm -f $(OBJS) $(LIBS)
++ rm -f $(OBJS) $(LIBOBJS) $(LIBS)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-06 7:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-06 7:13 [gentoo-commits] gentoo-x86 commit in net-libs/canlock/files: canlock-2b-make.patch Tim Harder (radhermit)
-- strict thread matches above, loose matches on Subject: below --
2012-08-24 21:59 Tim Harder (radhermit)
2011-09-30 10:05 Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox