[or-cvs] r19678: {torvm} Fix gcc download path and use canonical zlib source. Fix pat (in torvm/trunk: . build/kamikaze/common build/win32)

coderman at seul.org coderman at seul.org
Tue Jun 9 15:31:38 UTC 2009


Author: coderman
Date: 2009-06-09 11:31:38 -0400 (Tue, 09 Jun 2009)
New Revision: 19678

Modified:
   torvm/trunk/Makefile
   torvm/trunk/build/kamikaze/common/pkg-cache.mk
   torvm/trunk/build/win32/Makefile
Log:
Fix gcc download path and use canonical zlib source. Fix path for download script in win32 pre-caching.

Modified: torvm/trunk/Makefile
===================================================================
--- torvm/trunk/Makefile	2009-06-09 15:11:53 UTC (rev 19677)
+++ torvm/trunk/Makefile	2009-06-09 15:31:38 UTC (rev 19678)
@@ -117,7 +117,7 @@
 	@echo "Attempting pre-cache of kamikaze packages ..."
 	@su $(BUSER) -c "$(MAKE) IN_KAMIKAZE_PRECACHE=1 downloads"
 	@echo "Attempting pre-cache of win32 build packages ..."
-	@su $(BUSER) -c "$(MAKE) IN_WIN32_PRECACHE=1 downloads"
+	@su $(BUSER) -c "$(MAKE) IN_WIN32_PRECACHE=1 DLCMD=build/win32/scripts/download.sh downloads"
 
 import: prereq $(PRECACHE_OPT)
 	@if [ ! -d $(SDLDIR)/kamikaze ]; then \

Modified: torvm/trunk/build/kamikaze/common/pkg-cache.mk
===================================================================
--- torvm/trunk/build/kamikaze/common/pkg-cache.mk	2009-06-09 15:11:53 UTC (rev 19677)
+++ torvm/trunk/build/kamikaze/common/pkg-cache.mk	2009-06-09 15:31:38 UTC (rev 19678)
@@ -81,7 +81,7 @@
 BINUTILS_SUM=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
 
 GCC_F=gcc-4.4.0.tar.bz2
-GCC_URL=ftp://ftp.gnu.org/gnu/gcc/$(GCC_F)
+GCC_URL=ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.0/$(GCC_F)
 GCC_SUM=c5fe6f4c62ee7288765c3800ec9d21ad936bdcb5a04374cc09bd5a4232b836c9
 
 LINUX26_F=linux-2.6.28.10.tar.bz2
@@ -121,7 +121,7 @@
 LIBUPNP_SUM=58d7cabec2b21c80e28a4e5090bba94a849a8f02450e26c1b985318a36b0bbb3
 
 ZLIB_F=zlib-1.2.3.tar.bz2
-ZLIB_URL=http://downloads.sourceforge.net/zlib/$(ZLIB_F)?big_mirror=1
+ZLIB_URL=http://www.zlib.net/$(ZLIB_F)
 ZLIB_SUM=e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 
 OPENSSL_F=openssl-0.9.8k.tar.gz

Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile	2009-06-09 15:11:53 UTC (rev 19677)
+++ torvm/trunk/build/win32/Makefile	2009-06-09 15:31:38 UTC (rev 19678)
@@ -3,7 +3,10 @@
 
 SHELL=/bin/bash
 export SHELL
+
+ifeq (,$(DLCMD))
 DLCMD=scripts/download.sh
+endif
 
 ifeq (,$(ISODIR))
 	ISODIR=iso



More information about the tor-commits mailing list