]>
Commit | Line | Data |
---|---|---|
2f5cd112 AM |
1 | --- cryptlib-3.3.1/tools/buildall.sh~ 2008-06-30 19:31:02.000000000 +0200 |
2 | +++ cryptlib-3.3.1/tools/buildall.sh 2009-09-03 13:05:48.696867244 +0200 | |
3 | @@ -31,7 +31,7 @@ | |
4 | ||
5 | MAJ="3" | |
6 | MIN="3" | |
7 | -PLV="2" | |
8 | +PLV="3" | |
9 | PROJ="cl" | |
10 | SHARED_OBJ_PATH="./shared-obj/" | |
11 | if [ $OSNAME = "Darwin" ] ; then | |
9aa93c94 JB |
12 | --- cryptlib-3.3.1/tools/buildsharedlib.sh.orig 2006-11-14 04:48:16.000000000 +0100 |
13 | +++ cryptlib-3.3.1/tools/buildsharedlib.sh 2008-01-08 19:51:52.529507506 +0100 | |
14 | @@ -63,6 +63,8 @@ fi | |
15 | OSNAME=$1 | |
16 | LIBNAME=$2 | |
17 | LD=$3 | |
18 | +SONAME=$4 | |
19 | +shift | |
20 | shift | |
21 | shift | |
22 | shift | |
23 | @@ -97,6 +99,9 @@ case $OSNAME in | |
24 | fi | |
25 | strip $LIBNAME ;; | |
26 | ||
27 | + 'Linux') | |
28 | + $LD -shared -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` -Wl,-soname=${SONAME:-${LIBNAME}} | |
29 | + ;; | |
30 | *) | |
31 | $LD -shared -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; | |
32 | strip $LIBNAME ;; | |
33 | --- cryptlib-3.3.1/makefile.orig 2008-01-08 19:54:03.372389284 +0100 | |
34 | +++ cryptlib-3.3.1/makefile 2008-01-08 19:53:33.007613619 +0100 | |
35 | @@ -36,6 +36,7 @@ | |
36 | PROJ = cl | |
37 | LIBNAME = lib$(PROJ).a | |
38 | SLIBNAME = lib$(PROJ).so.$(MAJ).$(MIN).$(PLV) | |
39 | +SONAME = lib$(PROJ).so.$(MAJ) | |
40 | DYLIBNAME = lib$(PROJ).$(MAJ).$(MIN).dylib | |
41 | ||
42 | # Compiler options. By default this builds the release version of the code, | |
43 | @@ -1200,7 +1201,7 @@ | |
44 | ||
45 | ||
46 | $(SLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) | |
47 | - @./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) $(OBJS) \ | |
48 | + @./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) $(SONAME) $(OBJS) \ | |
49 | $(EXTRAOBJS) | |
50 | ||
51 | $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |