From: <har...@us...> - 2009-09-13 07:01:57
|
Revision: 4396 http://hugin.svn.sourceforge.net/hugin/?rev=4396&view=rev Author: harryvanderwolf Date: 2009-09-13 07:01:42 +0000 (Sun, 13 Sep 2009) Log Message: ----------- [OSX] update boost script and Setenv-universal.txt Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt hugin/trunk/mac/ExternalPrograms/scripts/boost.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2009-09-13 04:04:44 UTC (rev 4395) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2009-09-13 07:01:42 UTC (rev 4396) @@ -3,7 +3,7 @@ # has to be the absolute path from / -myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; +myREPOSITORYDIR="/Users/Shared/development/hugin_related/ExternalPrograms/repository"; # number of jobs that make can use, probably same as the number of CPUs. #PROCESSNUM=2 @@ -21,11 +21,15 @@ ppcOSVERSION="10.4" \ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ + ppcCC="gcc-4.0" \ + ppcCXX="g++-4.0" \ \ i386TARGET="i386-apple-darwin8" \ i386OSVERSION="10.4" \ i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.0" \ + i386CXX="g++-4.0" \ \ OTHERARGs="" \ OTHERMAKEARGs="--jobs=$PROCESSNUM"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-09-13 04:04:44 UTC (rev 4395) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-09-13 07:01:42 UTC (rev 4396) @@ -19,7 +19,7 @@ # OTHERARGs=""; -BOOST_VER="1_39" +BOOST_VER="1_40" # install headers @@ -48,7 +48,7 @@ mkdir -p "$REPOSITORYDIR/lib"; -# compile boost_thread +# compile boost_thread & filesystem for ARCH in $ARCHS do @@ -63,6 +63,8 @@ OPTIMIZE=$i386OPTIMIZE boostARCHITECTURE="x86" boostADDRESSMODEL="32" + export CC=$I386CC; + export CXX=$I386CXX; elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then MACSDKDIR=$ppcMACSDKDIR @@ -70,6 +72,8 @@ OPTIMIZE=$ppcOPTIMIZE boostARCHITECTURE="power" boostADDRESSMODEL="32" + export CC=$ppcCC; + export CXX=$ppcCXX; elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then MACSDKDIR=$ppc64MACSDKDIR @@ -77,6 +81,8 @@ OPTIMIZE=$ppc64OPTIMIZE boostARCHITECTURE="power" boostADDRESSMODEL="64" + export CC=$ppc64CC; + export CXX=$ppc64CXX; elif [ $ARCH = "x86_64" ] then MACSDKDIR=$x64MACSDKDIR @@ -84,12 +90,14 @@ OPTIMIZE=$x64OPTIMIZE boostARCHITECTURE="x86" boostADDRESSMODEL="64" + export CC=$x64CC; + export CXX=$x64CXX; fi SDKVRSION=$(echo $MACSDKDIR | sed 's/^[^1]*\([[:digit:]]*\.[[:digit:]]*\).*/\1/') - if [ $CXX = "" ] - then +if [ "$CXX" = "" ] +then boostTOOLSET="--toolset=darwin" CXX="g++" else @@ -99,7 +107,7 @@ # hack that sends extra arguments to g++ $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ - --with-thread \ + --with-thread --with-filesystem \ variant=release link=static \ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ @@ -112,7 +120,7 @@ # hack that sends extra arguments to g++ $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ - --with-thread \ + --with-thread --with-filesystem \ variant=release \ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ @@ -123,14 +131,19 @@ $COMMAND done; - mv ./stage-$ARCH/lib/libboost_thread-*.dylib ./stage-$ARCH/lib/libboost_thread-$BOOST_VER.dylib - mv ./stage-$ARCH/lib/libboost_thread-*.a ./stage-$ARCH/lib/libboost_thread-$BOOST_VER.a + mv ./stage-$ARCH/lib/libboost_thread.dylib ./stage-$ARCH/lib/libboost_thread-$BOOST_VER.dylib + mv ./stage-$ARCH/lib/libboost_thread.a ./stage-$ARCH/lib/libboost_thread-$BOOST_VER.a + mv ./stage-$ARCH/lib/libboost_filesystem.dylib ./stage-$ARCH/lib/libboost_filesystem-$BOOST_VER.dylib + mv ./stage-$ARCH/lib/libboost_filesystem.a ./stage-$ARCH/lib/libboost_filesystem-$BOOST_VER.a + mv ./stage-$ARCH/lib/libboost_system.dylib ./stage-$ARCH/lib/libboost_system-$BOOST_VER.dylib + mv ./stage-$ARCH/lib/libboost_system.a ./stage-$ARCH/lib/libboost_system-$BOOST_VER.a done +read pipo -# merge libboost_thread +# merge libboost_thread libboost_filesystem libboost_system -for liba in "lib/libboost_thread-$BOOST_VER.a" "lib/libboost_thread-$BOOST_VER.dylib" +for liba in "lib/libboost_thread-$BOOST_VER.a" "lib/libboost_filesystem-$BOOST_VER.a" "lib/libboost_thread-$BOOST_VER.dylib" "lib/libboost_filesystem-$BOOST_VER.dylib" do if [ $NUMARCH -eq 1 ] @@ -168,3 +181,14 @@ install_name_tool -id "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib" "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib"; ln -sfn libboost_thread-$BOOST_VER.dylib $REPOSITORYDIR/lib/libboost_thread.dylib; fi + +if [ -f "$REPOSITORYDIR/lib/libboost_filesystem-$BOOST_VER.a" ] +then + ln -sfn libboost_filesystem-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_fileystem.a; +fi +if [ -f "$REPOSITORYDIR/lib/libboost_filesystem-$BOOST_VER.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libboost_filesystem-$BOOST_VER.dylib" "$REPOSITORYDIR/lib/libboost_filesystem-$BOOST_VER.dylib"; + ln -sfn libboost_filesystem-$BOOST_VER.dylib $REPOSITORYDIR/lib/libboost_filesystem.dylib; +fi + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |