From fadc6458544400507b83a585ea901a72a299caca Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 14 May 2008 09:57:46 +0000 Subject: [PATCH] Mac: revise build scripts for c-ares and cURL to work when there are spaces in the paths svn path=/trunk/boinc/; revision=15197 --- checkin_notes | 10 ++++++++++ mac_build/buildc-ares.sh | 12 ++++++----- mac_build/buildcurl.sh | 43 +++++++++++++++++++++++++--------------- 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/checkin_notes b/checkin_notes index 3db1f8408a..d2679d478e 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3954,3 +3954,13 @@ David May 13 2008 sched/ sched_send.C validator.C + +Charlie May 14 2008 + - Mac: revise build scripts for c-ares and cURL to work when there are + spaces in the paths. These changes are based on information from + the cURL developers. + + mac_build/ + buildc-ares.sh + buildcurl.sh + \ No newline at end of file diff --git a/mac_build/buildc-ares.sh b/mac_build/buildc-ares.sh index 1dbe1c0cef..b6ed20eee3 100644 --- a/mac_build/buildc-ares.sh +++ b/mac_build/buildc-ares.sh @@ -24,7 +24,7 @@ # use in building BOINC. # # by Charlie Fenton 7/21/06 -# Updated 2/27/08 +# Updated 5/14/08 # ## In Terminal, CD to the c-ares-1.5.1 directory. ## cd [path]/c-ares-1.5.1/ @@ -96,7 +96,9 @@ export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9 export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" -./configure --enable-shared=NO --host=ppc +# curl configure and make expect a path to _installed_ c-ares-1.5.1 +# so set a temporary install path that does not contain spaces. +./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=ppc if [ $? -ne 0 ]; then return 1; fi else @@ -106,7 +108,7 @@ export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Deve export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" -./configure --enable-shared=NO --host=ppc +./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=ppc fi if [ $? -ne 0 ]; then return 1; fi @@ -129,7 +131,7 @@ export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.4 -./configure --enable-shared=NO --host=i386 +./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=i386 if [ $? -ne 0 ]; then return 1; fi make @@ -165,7 +167,7 @@ export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" export MACOSX_DEPLOYMENT_TARGET=10.5 -./configure --enable-shared=NO --host=x86_64 --without-random CFLAGS="-arch x86_64" +./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=x86_64 if [ $? -ne 0 ]; then return 1; fi make diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index 0795492ddd..284d547c28 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -24,7 +24,7 @@ # use in building BOINC. # # by Charlie Fenton 7/21/06 -# Updated 2/27/08 +# Updated 5/14/08 # ## In Terminal, CD to the curl-7.18.0 directory. ## cd [path]/curl-7.18.0/ @@ -81,6 +81,14 @@ if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then fi export PATH=/usr/local/bin:$PATH + +CURL_DIR=`pwd` +# curl configure and make expect a path to _installed_ c-ares-1.5.1 +# so temporarily install c-ares at a path that does not contain spaces. +cd ../c-ares-1.5.1 +sudo make install +cd "${CURL_DIR}" + export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk" export MACOSX_DEPLOYMENT_TARGET=10.3 @@ -92,20 +100,20 @@ rm -f lib/.libs/libcurl_x86_64.a if [ $usegcc33 -ne 0 ]; then export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 -export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" -export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isystem /Developer/SDKs/MacOSX10.3.9.sdk" -export CFLAGS="-arch ppc -D_NONSTD_SOURCE -I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isystem /Developer/SDKs/MacOSX10.3.9.sdk" +export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" +export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" +export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" else export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS=" -L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" -export CPPFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" -export CFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export LDFLAGS=" -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" fi -./configure --enable-shared=NO --enable-ares=../c-ares-1.5.1 --host=ppc +./configure --enable-shared=NO --enable-ares=/tmp/installed-c-ares --host=ppc if [ $? -ne 0 ]; then return 1; fi @@ -120,13 +128,13 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" -export CPPFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -export CFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.4 -./configure --enable-shared=NO --enable-ares=../c-ares-1.5.1 --host=i386 +./configure --enable-shared=NO --enable-ares=/tmp/installed-c-ares --host=i386 if [ $? -ne 0 ]; then return 1; fi make @@ -156,13 +164,13 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch x86_64" -export CPPFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" -export CFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" export MACOSX_DEPLOYMENT_TARGET=10.5 -./configure --enable-shared=NO --enable-ares=../c-ares-1.5.1 --host=x86_64 --without-random CFLAGS="-arch x86_64" +./configure --enable-shared=NO --enable-ares=/tmp/installed-c-ares --host=x86_64 if [ $? -ne 0 ]; then return 1; fi make @@ -180,4 +188,7 @@ mv -f lib/libcurl_i386.a lib/.libs/ lipo -create lib/.libs/libcurl_i386.a lib/.libs/libcurl_x86_64.a lib/.libs/libcurl_ppc.a -output lib/.libs/libcurl.a if [ $? -ne 0 ]; then return 1; fi +# Delete temporarily installed c-ares. +sudo rm -Rf /tmp/installed-c-ares/ + return 0