Make curl, jpeg build scripts more robust

svn path=/trunk/boinc/; revision=14417
This commit is contained in:
Charlie Fenton 2007-12-19 23:58:31 +00:00
parent dcce4d6717
commit e7390f278a
2 changed files with 10 additions and 10 deletions

View File

@ -24,7 +24,7 @@
# use in building BOINC. # use in building BOINC.
# #
# by Charlie Fenton 7/21/06 # by Charlie Fenton 7/21/06
# Updated 12/18/07 # Updated 12/19/07
# #
## In Terminal, CD to the curl-7.17.1 directory. ## In Terminal, CD to the curl-7.17.1 directory.
## cd [path]/curl-7.17.1/ ## cd [path]/curl-7.17.1/
@ -80,7 +80,7 @@ rm -f lib/.libs/libcurl_x86_64.a
if [ $usegcc33 -ne 0 ]; then if [ $usegcc33 -ne 0 ]; then
export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3
export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -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 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" export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk"
@ -90,7 +90,7 @@ if [ $? -ne 0 ]; then return 1; fi
else else
export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0
export LDFLAGS="-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 CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc"
export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc"
@ -111,7 +111,7 @@ if [ $? -ne 0 ]; then return 1; fi
##export PATH=/usr/local/bin:$PATH ##export PATH=/usr/local/bin:$PATH
export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0
export LDFLAGS="-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 CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386"
export CFLAGS="-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 SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"
@ -147,7 +147,7 @@ if [ $? -ne 0 ]; then return 1; fi
##export PATH=/usr/local/bin:$PATH ##export PATH=/usr/local/bin:$PATH
export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0
export LDFLAGS="-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 CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64"
export CFLAGS="-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 SDKROOT="/Developer/SDKs/MacOSX10.5.sdk"

View File

@ -23,7 +23,7 @@
# Script to build Macintosh Universal Binary library of jpeg-6b for # Script to build Macintosh Universal Binary library of jpeg-6b for
# use in building BOINC. # use in building BOINC.
# #
# by Charlie Fenton 12/4/07 # by Charlie Fenton 12/19/07
# #
## In Terminal, CD to the jpeg-6b directory. ## In Terminal, CD to the jpeg-6b directory.
## cd [path]/jpeg-6b/ ## cd [path]/jpeg-6b/
@ -55,9 +55,9 @@ fi
export PATH=/usr/local/bin:$PATH export PATH=/usr/local/bin:$PATH
export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3
export LDFLAGS="-arch ppc -D_NONSTD_SOURCE" 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" export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk"
export CFLAGS="-arch ppc -D_NONSTD_SOURCE" export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk"
export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk" export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk"
export MACOSX_DEPLOYMENT_TARGET=10.3 export MACOSX_DEPLOYMENT_TARGET=10.3
@ -79,7 +79,7 @@ if [ $? -ne 0 ]; then return 1; fi
##export PATH=/usr/local/bin:$PATH ##export PATH=/usr/local/bin:$PATH
export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0
export LDFLAGS="-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 CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386"
export CFLAGS="-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 SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"