| 1 |
flameeyes 12/08/29 22:30:16 |
| 2 |
|
| 3 |
Added: ufdbguard-1.29-parallel-make.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ufdbguard-1.29-parallel-make.patch |
| 16 |
=================================================================== |
| 17 |
--- a/src/Makefile.in 2010-04-12 04:39:43.000000000 +0200 |
| 18 |
--- b/src/Makefile.in 2010-05-07 05:26:03.000000000 +0200 |
| 19 |
@@ -135,8 +135,8 @@ |
| 20 |
# Dependencies for installing |
| 21 |
# |
| 22 |
|
| 23 |
-daemon: |
| 24 |
- cd mtserver; make |
| 25 |
+daemon: $(UFDBOBJS) |
| 26 |
+ cd mtserver; $(MAKE) |
| 27 |
|
| 28 |
ufdbhttpd: ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o |
| 29 |
$(LINK) ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o $(LIBS) |
| 30 |
@@ -235,6 +235,6 @@ |
| 31 |
$(RM) $(bindir)/ufdbhttpd |
| 32 |
|
| 33 |
install.mt:: |
| 34 |
- cd mtserver ; make |
| 35 |
+ cd mtserver ; $(MAKE) |
| 36 |
$(INSTALL_PROGRAM) mtserver/ufdbguardd $(bindir)/ufdbguardd |
| 37 |
$(INSTALL_PROGRAM) mtserver/ufdbgclient $(bindir)/ufdbgclient |
| 38 |
@@ -272,8 +272,8 @@ |
| 39 |
$(RM) *~ *.bak core core.* *.log *.log.[0-9] *.error |
| 40 |
$(RM) *.o y.tab.c y.tab.h ufdbGuard ufdbGenTable ufdbAnalyse ufdbPrintTable ufdbhttpd |
| 41 |
$(RM) ipv6 iptst rwtest lex.yy.c |
| 42 |
- -@cd mtserver && make clean |
| 43 |
- -@cd api 2>/dev/null && make clean |
| 44 |
+ -@cd mtserver && $(MAKE) clean |
| 45 |
+ -@cd api 2>/dev/null && $(MAKE) clean |
| 46 |
|
| 47 |
realclean:: clean |
| 48 |
@echo making $@ in `basename \`pwd\`` |
| 49 |
@@ -286,11 +286,11 @@ |
| 50 |
distclean:: realclean |
| 51 |
@echo making $@ in `basename \`pwd\`` |
| 52 |
$(RM) Makefile sg.h config.h ufdbUpdate ufdbConvertDB ufdbGuard.conf |
| 53 |
- -cd mtserver ; make distclean |
| 54 |
+ -cd mtserver ; $(MAKE) distclean |
| 55 |
|
| 56 |
apidistclean: distclean |
| 57 |
@echo making $@ in `basename \`pwd\`` |
| 58 |
- -cd api ; make distclean |
| 59 |
+ -cd api ; $(MAKE) distclean |
| 60 |
|
| 61 |
grab: ufdbGrab |
| 62 |
./ufdbGrab $(cfgdir) $(logdir) |
| 63 |
@@ -532,25 +532,25 @@ |
| 64 |
$(CC) --version |
| 65 |
|
| 66 |
g2953: |
| 67 |
- make clean |
| 68 |
- CC=/usr/local/gcc/2.95.3/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 69 |
+ $(MAKE) clean |
| 70 |
+ CC=/usr/local/gcc/2.95.3/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 71 |
|
| 72 |
g344: |
| 73 |
- make clean |
| 74 |
- CC=/usr/local/gcc/3.4.4/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 75 |
+ $(MAKE) clean |
| 76 |
+ CC=/usr/local/gcc/3.4.4/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 77 |
|
| 78 |
g401: |
| 79 |
- make clean |
| 80 |
- CC=/usr/local/gcc/4.0.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 81 |
+ $(MAKE) clean |
| 82 |
+ CC=/usr/local/gcc/4.0.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 83 |
|
| 84 |
g411: |
| 85 |
- make clean |
| 86 |
- CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 87 |
+ $(MAKE) clean |
| 88 |
+ CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable |
| 89 |
|
| 90 |
qinst: |
| 91 |
/etc/init.d/squid stop |
| 92 |
/etc/init.d/ufdb stop |
| 93 |
- make install |
| 94 |
+ $(MAKE) install |
| 95 |
/etc/init.d/ufdb start |
| 96 |
/etc/init.d/squid start |
| 97 |
|
| 98 |
--- a/src/mtserver/Makefile.in 2010-04-12 02:56:20.000000000 +0200 |
| 99 |
--- b/src/mtserver/Makefile.in 2010-05-07 05:26:03.000000000 +0200 |
| 100 |
@@ -48,10 +48,10 @@ |
| 101 |
$(LINK) ufdbgclient.o -L. -lufdbd $(SOLARIS_LIBS) |
| 102 |
|
| 103 |
../lex.yy.o: |
| 104 |
- cd .. ; make lex.yy.o |
| 105 |
+ cd .. ; $(MAKE) lex.yy.o |
| 106 |
|
| 107 |
../y.tab.o: |
| 108 |
- cd .. ; make y.tab.o |
| 109 |
+ cd .. ; $(MAKE) y.tab.o |
| 110 |
|
| 111 |
$(MYLIB): ../crypt.o ../lex.yy.o ../sgDiv.o ../sgLog.o ../ufdbLookup.o \ |
| 112 |
../ufdblib.o ../y.tab.o ../ufdbbase.o |
| 113 |
@@ -60,7 +60,7 @@ |
| 114 |
../ufdblib.o ../y.tab.o ../ufdbbase.o |
| 115 |
|
| 116 |
ptmalloc3/libptmalloc3.a: |
| 117 |
- cd ptmalloc3 ; make linux-pthread |
| 118 |
+ cd ptmalloc3 ; $(MAKE) linux-pthread |
| 119 |
|
| 120 |
$(MYLIBSSL): ../ufdbchkport.o ../httpsQueue.o ../ufdbHashtable.o |
| 121 |
-@rm -f $(MYLIBSSL) |
| 122 |
@@ -102,7 +102,7 @@ |
| 123 |
./ufdbgclient -p $(PORT) -l . -d "www.sex.com" 10.1.1.1 kees |
| 124 |
|
| 125 |
../../test/blacklist/domains.ufdb: ../../test/blacklist/domains |
| 126 |
- cd ../../test ; make blacklist/domains.ufdb |
| 127 |
+ cd ../../test ; $(MAKE) blacklist/domains.ufdb |
| 128 |
|
| 129 |
LEAKOPTS= --leak-check=full --show-reachable=yes |
| 130 |
LEAKOPTS= |
| 131 |
@@ -382,7 +382,7 @@ |
| 132 |
time ./ufdbgclient -p $(PORT) -l . < ../100000 > /dev/null 2>&1 |
| 133 |
|
| 134 |
tt: |
| 135 |
- make tp3 |
| 136 |
+ $(MAKE) tp3 |
| 137 |
sleep 3 |
| 138 |
kill -HUP `ps -ef | grep ufdbguardd | grep -v grep | head -1 | awk '{ print $$2 }'` |
| 139 |
|
| 140 |
@@ -455,6 +455,6 @@ |
| 141 |
|
| 142 |
|
| 143 |
g411: |
| 144 |
- make clean |
| 145 |
- CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) all |
| 146 |
+ $(MAKE) clean |
| 147 |
+ CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) all |
Archives