split package.mk and clean up build system code (based on patch by mbm), makes the...
[openwrt.git] / package / strongswan / patches / 100-ar-fixes.patch
1 diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libaes/Makefile strongswan-2.8.1/lib/libcrypto/libaes/Makefile
2 --- strongswan-2.8.1-orig/lib/libcrypto/libaes/Makefile 2004-03-22 16:53:16.000000000 -0500
3 +++ strongswan-2.8.1/lib/libcrypto/libaes/Makefile 2007-01-17 00:48:52.260789653 -0500
4 @@ -25,10 +25,8 @@
5
6 $(BLIB): $(LIBOBJ)
7 /bin/rm -f $(BLIB)
8 - ar cr $(BLIB) $(LIBOBJ)
9 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
10 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
11 - else exit 0; fi; fi
12 + $(AR) cr $(BLIB) $(LIBOBJ)
13 + $(RANLIB) $(BLIB)
14
15 testx: test_main_mac.o $(BLIB)
16 $(CC) -o $@ $^
17 diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libblowfish/Makefile strongswan-2.8.1/lib/libcrypto/libblowfish/Makefile
18 --- strongswan-2.8.1-orig/lib/libcrypto/libblowfish/Makefile 2004-03-22 16:53:16.000000000 -0500
19 +++ strongswan-2.8.1/lib/libcrypto/libblowfish/Makefile 2007-01-17 01:40:41.716879761 -0500
20 @@ -58,7 +58,7 @@
21 lib: $(LIB)
22
23 $(LIB): $(LIBOBJ)
24 - $(AR) $(LIB) $(LIBOBJ)
25 + $(AR) -r $(LIB) $(LIBOBJ)
26 $(RANLIB) $(LIB)
27
28 # elf
29 diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libserpent/Makefile strongswan-2.8.1/lib/libcrypto/libserpent/Makefile
30 --- strongswan-2.8.1-orig/lib/libcrypto/libserpent/Makefile 2004-03-22 16:53:16.000000000 -0500
31 +++ strongswan-2.8.1/lib/libcrypto/libserpent/Makefile 2007-01-17 00:50:37.692571031 -0500
32 @@ -8,10 +8,8 @@
33
34 $(BLIB): $(LIBOBJ)
35 /bin/rm -f $(BLIB)
36 - ar cr $(BLIB) $(LIBOBJ)
37 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
38 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
39 - else exit 0; fi; fi
40 + $(AR) cr $(BLIB) $(LIBOBJ)
41 + $(RANLIB) $(BLIB)
42
43 test: test_main.o $(BLIB)
44 $(CC) -o $@ $^
45 diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libsha2/Makefile strongswan-2.8.1/lib/libcrypto/libsha2/Makefile
46 --- strongswan-2.8.1-orig/lib/libcrypto/libsha2/Makefile 2004-03-22 16:53:16.000000000 -0500
47 +++ strongswan-2.8.1/lib/libcrypto/libsha2/Makefile 2007-01-17 00:50:46.050791555 -0500
48 @@ -9,10 +9,8 @@
49
50 $(BLIB): $(LIBOBJ)
51 /bin/rm -f $(BLIB)
52 - ar cr $(BLIB) $(LIBOBJ)
53 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
54 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
55 - else exit 0; fi; fi
56 + $(AR) cr $(BLIB) $(LIBOBJ)
57 + $(RANLIB) $(BLIB)
58
59 test: test_main.o $(BLIB)
60 $(CC) -o $@ $^
61 diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libtwofish/Makefile strongswan-2.8.1/lib/libcrypto/libtwofish/Makefile
62 --- strongswan-2.8.1-orig/lib/libcrypto/libtwofish/Makefile 2004-03-22 16:53:17.000000000 -0500
63 +++ strongswan-2.8.1/lib/libcrypto/libtwofish/Makefile 2007-01-17 00:50:53.533988997 -0500
64 @@ -9,10 +9,8 @@
65
66 $(BLIB): $(LIBOBJ)
67 /bin/rm -f $(BLIB)
68 - ar cr $(BLIB) $(LIBOBJ)
69 - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
70 - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
71 - else exit 0; fi; fi
72 + $(AR) cr $(BLIB) $(LIBOBJ)
73 + $(RANLIB) $(BLIB)
74
75 test: test_main.o $(BLIB)
76 $(CC) -o $@ $^
This page took 0.049036 seconds and 5 git commands to generate.