From 73eb5ef26ceca9b9d1a34a2e7d018be94e8b3107 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 17 Jan 2007 07:32:30 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11888 --- checkin_notes | 7 +++++++ mac_build/setupForBOINC.sh | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/checkin_notes b/checkin_notes index 8a8ab19be0..69f1ff23cc 100755 --- a/checkin_notes +++ b/checkin_notes @@ -670,3 +670,10 @@ David 16 Jan 2007 client/ app.h cpu_sched.C + +Charlie 16 Jan 2007 + Mac: Fix build script for Curl 7.15.5 (should have been done + 3 months ago.) + + mac_build/ + setupForBOINC.sh diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh index 13067b3e35..052ed7b47d 100644 --- a/mac_build/setupForBOINC.sh +++ b/mac_build/setupForBOINC.sh @@ -21,9 +21,10 @@ # # # Master script to build Universal Binary libraries needed by BOINC: -# curl-7.15.3, jpeg-6b and wxMac-2.6.3 +# curl-7.15.5, jpeg-6b and wxMac-2.6.3 # # by Charlie Fenton 7/21/06 +# updated 1/16/07 # # Download these three packages and place them in a common parent # directory with the BOINC source tree. @@ -48,19 +49,19 @@ fi echo "" echo "----------------------------------" -echo "------- BUILD CURL-7.15.3 --------" +echo "------- BUILD CURL-7.15.5 --------" echo "----------------------------------" echo "" SCRIPT_DIR=`pwd` -if [ ! -f ../../curl-7.15.3/lib/url.c.orig ]; then -patch -bN ../../curl-7.15.3/lib/url.c ../curl/patches/7.15.3.Socks/url_c.patch +if [ ! -f ../../curl-7.15.5/lib/url.c.orig ]; then +patch -bN ../../curl-7.15.5/lib/url.c ../curl/patches/7.15.5.Socks/url_c.patch else echo "url.c already patched" fi -cd ../../curl-7.15.3/ +cd ../../curl-7.15.5/ if [ $? -ne 0 ]; then return 1; fi source "${SCRIPT_DIR}/buildcurl.sh" ${doclean} if [ $? -ne 0 ]; then return 1; fi