Fix the imagebuilder generation (does not mean it works with the recent changes)
[openwrt.git] / package / strongswan / patches / 100-ar-fixes.patch
1 Index: strongswan-2.8.2/lib/libcrypto/libaes/Makefile
2 ===================================================================
3 --- strongswan-2.8.2.orig/lib/libcrypto/libaes/Makefile 2007-06-04 13:23:04.777007680 +0200
4 +++ strongswan-2.8.2/lib/libcrypto/libaes/Makefile 2007-06-04 13:23:04.873992936 +0200
5 @@ -25,10 +25,8 @@
6
7 $(BLIB): $(LIBOBJ)
8 /bin/rm -f $(BLIB)
9 - ar cr $(BLIB) $(LIBOBJ)
10 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
11 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
12 - else exit 0; fi; fi
13 + $(AR) cr $(BLIB) $(LIBOBJ)
14 + $(RANLIB) $(BLIB)
15
16 testx: test_main_mac.o $(BLIB)
17 $(CC) -o $@ $^
18 Index: strongswan-2.8.2/lib/libcrypto/libblowfish/Makefile
19 ===================================================================
20 --- strongswan-2.8.2.orig/lib/libcrypto/libblowfish/Makefile 2007-06-04 13:23:04.783006768 +0200
21 +++ strongswan-2.8.2/lib/libcrypto/libblowfish/Makefile 2007-06-04 13:23:04.873992936 +0200
22 @@ -58,7 +58,7 @@
23 lib: $(LIB)
24
25 $(LIB): $(LIBOBJ)
26 - $(AR) $(LIB) $(LIBOBJ)
27 + $(AR) -r $(LIB) $(LIBOBJ)
28 $(RANLIB) $(LIB)
29
30 # elf
31 Index: strongswan-2.8.2/lib/libcrypto/libserpent/Makefile
32 ===================================================================
33 --- strongswan-2.8.2.orig/lib/libcrypto/libserpent/Makefile 2007-06-04 13:23:04.790005704 +0200
34 +++ strongswan-2.8.2/lib/libcrypto/libserpent/Makefile 2007-06-04 13:23:04.873992936 +0200
35 @@ -8,10 +8,8 @@
36
37 $(BLIB): $(LIBOBJ)
38 /bin/rm -f $(BLIB)
39 - ar cr $(BLIB) $(LIBOBJ)
40 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
41 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
42 - else exit 0; fi; fi
43 + $(AR) cr $(BLIB) $(LIBOBJ)
44 + $(RANLIB) $(BLIB)
45
46 test: test_main.o $(BLIB)
47 $(CC) -o $@ $^
48 Index: strongswan-2.8.2/lib/libcrypto/libsha2/Makefile
49 ===================================================================
50 --- strongswan-2.8.2.orig/lib/libcrypto/libsha2/Makefile 2007-06-04 13:23:04.796004792 +0200
51 +++ strongswan-2.8.2/lib/libcrypto/libsha2/Makefile 2007-06-04 13:23:04.874992784 +0200
52 @@ -9,10 +9,8 @@
53
54 $(BLIB): $(LIBOBJ)
55 /bin/rm -f $(BLIB)
56 - ar cr $(BLIB) $(LIBOBJ)
57 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
58 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
59 - else exit 0; fi; fi
60 + $(AR) cr $(BLIB) $(LIBOBJ)
61 + $(RANLIB) $(BLIB)
62
63 test: test_main.o $(BLIB)
64 $(CC) -o $@ $^
65 Index: strongswan-2.8.2/lib/libcrypto/libtwofish/Makefile
66 ===================================================================
67 --- strongswan-2.8.2.orig/lib/libcrypto/libtwofish/Makefile 2007-06-04 13:23:04.804003576 +0200
68 +++ strongswan-2.8.2/lib/libcrypto/libtwofish/Makefile 2007-06-04 13:23:04.874992784 +0200
69 @@ -9,10 +9,8 @@
70
71 $(BLIB): $(LIBOBJ)
72 /bin/rm -f $(BLIB)
73 - ar cr $(BLIB) $(LIBOBJ)
74 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
75 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
76 - else exit 0; fi; fi
77 + $(AR) cr $(BLIB) $(LIBOBJ)
78 + $(RANLIB) $(BLIB)
79
80 test: test_main.o $(BLIB)
81 $(CC) -o $@ $^
This page took 0.058526 seconds and 5 git commands to generate.