fix xyssl headers install (closes: #2330), refresh patches.
[openwrt/svn-archive/archive.git] / libs / xyssl / patches / 001-cross_compile.patch
1 Index: xyssl-0.7/library/Makefile
2 ===================================================================
3 --- xyssl-0.7.orig/library/Makefile 2007-09-23 23:28:33.000000000 +0200
4 +++ xyssl-0.7/library/Makefile 2007-09-23 23:28:33.000000000 +0200
5 @@ -9,10 +9,13 @@
6 # _BSD_EXTENSION when compiling on Plan9
7
8 DEFINES = -DSELF_TEST -DHAVE_RDTSC
9 -CFLAGS = $(DEFINES) -I../include -O
10 +CFLAGS = $(DEFINES) -I../include
11 +OFLAGS = -O
12 +
13 +AR ?= ar
14
15 # To compile as a shared library:
16 -# CFLAGS += -fPIC
17 +CFLAGS += -fPIC
18
19 # MicroBlaze specific options:
20 # CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift
21 @@ -25,21 +28,21 @@
22
23 .SILENT:
24
25 -all: libxyssl.a
26 +all: libxyssl.a libxyssl.so
27
28 libxyssl.a: $(OBJS)
29 echo " AR $@"
30 - ar r $@ $(OBJS)
31 + $(AR) r $@ $(OBJS)
32
33 shared: libxyssl.so
34
35 libxyssl.so: libxyssl.a
36 echo " LD $@"
37 - gcc -shared -Wl,-soname,$@ -o $@ $(OBJS)
38 + $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS)
39
40 .c.o:
41 echo " CC $<"
42 - $(CC) $(CFLAGS) -c $<
43 + $(CC) $(CFLAGS) $(OFLAGS) -c $<
44
45 clean:
46 rm -f *.o libxyssl.*
47 Index: xyssl-0.7/programs/Makefile
48 ===================================================================
49 --- xyssl-0.7.orig/programs/Makefile 2007-09-23 23:28:33.000000000 +0200
50 +++ xyssl-0.7/programs/Makefile 2007-09-23 23:28:33.000000000 +0200
51 @@ -2,7 +2,8 @@
52 # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
53 # To compile on MinGW: add "-lws2_32" to LDFLAGS
54
55 -CFLAGS = -I../include -O
56 +CFLAGS = -I../include
57 +OFLAGS = -O
58 LDFLAGS = -L../library -lxyssl
59
60 APPS = aes/aescrypt2 hash/hello \
61 @@ -21,71 +22,71 @@
62
63 aes/aescrypt2: aes/aescrypt2.c ../library/libxyssl.a
64 echo " CC aes/aescrypt2.c"
65 - $(CC) $(CFLAGS) aes/aescrypt2.c $(LDFLAGS) -o $@
66 + $(CC) $(CFLAGS) $(OFLAGS) aes/aescrypt2.c $(LDFLAGS) -o $@
67
68 hash/hello: hash/hello.c ../library/libxyssl.a
69 echo " CC hash/hello.c"
70 - $(CC) $(CFLAGS) hash/hello.c $(LDFLAGS) -o $@
71 + $(CC) $(CFLAGS) $(OFLAGS) hash/hello.c $(LDFLAGS) -o $@
72
73 hash/md5sum: hash/md5sum.c ../library/libxyssl.a
74 echo " CC hash/md5sum.c"
75 - $(CC) $(CFLAGS) hash/md5sum.c $(LDFLAGS) -o $@
76 + $(CC) $(CFLAGS) $(OFLAGS) hash/md5sum.c $(LDFLAGS) -o $@
77
78 hash/sha1sum: hash/sha1sum.c ../library/libxyssl.a
79 echo " CC hash/sha1sum.c"
80 - $(CC) $(CFLAGS) hash/sha1sum.c $(LDFLAGS) -o $@
81 + $(CC) $(CFLAGS) $(OFLAGS) hash/sha1sum.c $(LDFLAGS) -o $@
82
83 hash/sha2sum: hash/sha2sum.c ../library/libxyssl.a
84 echo " CC hash/sha2sum.c"
85 - $(CC) $(CFLAGS) hash/sha2sum.c $(LDFLAGS) -o $@
86 + $(CC) $(CFLAGS) $(OFLAGS) hash/sha2sum.c $(LDFLAGS) -o $@
87
88 pkey/dh_client: pkey/dh_client.c ../library/libxyssl.a
89 echo " CC pkey/dh_client.c"
90 - $(CC) $(CFLAGS) pkey/dh_client.c $(LDFLAGS) -o $@
91 + $(CC) $(CFLAGS) $(OFLAGS) pkey/dh_client.c $(LDFLAGS) -o $@
92
93 pkey/dh_genprime: pkey/dh_genprime.c ../library/libxyssl.a
94 echo " CC pkey/dh_genprime.c"
95 - $(CC) $(CFLAGS) pkey/dh_genprime.c $(LDFLAGS) -o $@
96 + $(CC) $(CFLAGS) $(OFLAGS) pkey/dh_genprime.c $(LDFLAGS) -o $@
97
98 pkey/dh_server: pkey/dh_server.c ../library/libxyssl.a
99 echo " CC pkey/dh_server.c"
100 - $(CC) $(CFLAGS) pkey/dh_server.c $(LDFLAGS) -o $@
101 + $(CC) $(CFLAGS) $(OFLAGS) pkey/dh_server.c $(LDFLAGS) -o $@
102
103 pkey/mpi_demo: pkey/mpi_demo.c ../library/libxyssl.a
104 echo " CC pkey/mpi_demo.c"
105 - $(CC) $(CFLAGS) pkey/mpi_demo.c $(LDFLAGS) -o $@
106 + $(CC) $(CFLAGS) $(OFLAGS) pkey/mpi_demo.c $(LDFLAGS) -o $@
107
108 pkey/rsa_genkey: pkey/rsa_genkey.c ../library/libxyssl.a
109 echo " CC pkey/rsa_genkey.c"
110 - $(CC) $(CFLAGS) pkey/rsa_genkey.c $(LDFLAGS) -o $@
111 + $(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_genkey.c $(LDFLAGS) -o $@
112
113 pkey/rsa_sign: pkey/rsa_sign.c ../library/libxyssl.a
114 echo " CC pkey/rsa_sign.c"
115 - $(CC) $(CFLAGS) pkey/rsa_sign.c $(LDFLAGS) -o $@
116 + $(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_sign.c $(LDFLAGS) -o $@
117
118 pkey/rsa_verify: pkey/rsa_verify.c ../library/libxyssl.a
119 echo " CC pkey/rsa_verify.c"
120 - $(CC) $(CFLAGS) pkey/rsa_verify.c $(LDFLAGS) -o $@
121 + $(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_verify.c $(LDFLAGS) -o $@
122
123 ssl/ssl_client1: ssl/ssl_client1.c ../library/libxyssl.a
124 echo " CC ssl/ssl_client1.c"
125 - $(CC) $(CFLAGS) ssl/ssl_client1.c $(LDFLAGS) -o $@
126 + $(CC) $(CFLAGS) $(OFLAGS) ssl/ssl_client1.c $(LDFLAGS) -o $@
127
128 ssl/ssl_client2: ssl/ssl_client2.c ../library/libxyssl.a
129 echo " CC ssl/ssl_client2.c"
130 - $(CC) $(CFLAGS) ssl/ssl_client2.c $(LDFLAGS) -o $@
131 + $(CC) $(CFLAGS) $(OFLAGS) ssl/ssl_client2.c $(LDFLAGS) -o $@
132
133 ssl/ssl_server: ssl/ssl_server.c ../library/libxyssl.a
134 echo " CC ssl/ssl_server.c"
135 - $(CC) $(CFLAGS) ssl/ssl_server.c $(LDFLAGS) -o $@
136 + $(CC) $(CFLAGS) $(OFLAGS) ssl/ssl_server.c $(LDFLAGS) -o $@
137
138 test/benchmark: test/benchmark.c ../library/libxyssl.a
139 echo " CC test/benchmark.c"
140 - $(CC) $(CFLAGS) test/benchmark.c $(LDFLAGS) -o $@
141 + $(CC) $(CFLAGS) $(OFLAGS) test/benchmark.c $(LDFLAGS) -o $@
142
143 test/selftest: test/selftest.c ../library/libxyssl.a
144 echo " CC test/selftest.c"
145 - $(CC) $(CFLAGS) test/selftest.c $(LDFLAGS) -o $@
146 + $(CC) $(CFLAGS) $(OFLAGS) test/selftest.c $(LDFLAGS) -o $@
147
148 clean:
149 rm -f $(APPS)