From: <har...@us...> - 2008-08-13 19:13:31
|
Revision: 3316 http://hugin.svn.sourceforge.net/hugin/?rev=3316&view=rev Author: harryvanderwolf Date: 2008-08-13 19:13:19 +0000 (Wed, 13 Aug 2008) Log Message: ----------- [Mac] OSX Tiger comes without gettext and subversion. To be able to build a universal bundle without MacPorts and/or Fink you can use these scripts to build them Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/Readme.txt hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr-util.sh hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr.sh hugin/trunk/mac/ExternalPrograms/scripts/Tiger/gettext.sh hugin/trunk/mac/ExternalPrograms/scripts/Tiger/libneon.sh hugin/trunk/mac/ExternalPrograms/scripts/Tiger/subversion.sh Added: hugin/trunk/mac/ExternalPrograms/scripts/Tiger/Readme.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/Readme.txt (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/Readme.txt 2008-08-13 19:13:19 UTC (rev 3316) @@ -0,0 +1,16 @@ +Tiger utilities. + +Tiger comes without subversion and gettext installed. These scripts install: +- gettext: for msgfmt use and as a dependency for subversion +- apr: apache runtime modules for svn 1.5 +- apr-util: apache runtime utils for svn 1.5 +- libneon: for https support for subversion +- subversion. + +Please note that this is a "barebones" subversion. You can't setup a +local SVN server. It is only for downloading svn based source code from +Open Source servers. + + +Harry van der Wolf, 200808 + Added: hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr-util.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr-util.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr-util.sh 2008-08-13 19:13:19 UTC (rev 3316) @@ -0,0 +1,152 @@ +# ------------------ +# libaprutil +# ------------------ +# Based on the works of (c) 2007, Ippei Ukai +# Created for Tiger by Harry van der Wolf 2008 + +# download location http://apr.apache.org/ + +# prepare + +# export REPOSITORYDIR="/PATH2AVIDEMUX/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +MAIN_LIB_VER="1" +EXT_MAIN_LIB_VER="$MAIN_LIB_VER.0" +FULL_LIB_VER="$EXT_MAIN_LIB_VER.2.12" + +OTHERMAKEARGs="" + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + export PATH=/usr/bin:$REPOSITORYDIR/bin:$PATH + # We copied the apr build-1 directory out of the way. For the apr-utils we need to + # copy them back temporarily + # cp -R "$REPOSITORYDIR/arch/$ARCH/build-1" "$REPOSITORYDIR/build-1"; + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -arch $ARCH" \ + LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -dead_strip -prebind" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-shared CC="gcc -arch $ARCH" \ + --with-apr=$REPOSITORYDIR/bin/apr-1-config --with-expat=$REPOSITORYDIR \ + --with-iconv=/usr --without-berkeley-db \ + --without-mysql --without-pgsql --without-sqlite2 --with-sqlite3=/usr/lib \ +; + + make clean; + #make + make $OTHERMAKEARGs; + make install; + + # And now we need to remove the temporary directory again + # rm -rf "$REPOSITORYDIR/build-1"; + +done + + +# merge libaprutil + +for liba in lib/libaprutil-$MAIN_LIB_VER.a lib/libaprutil-$FULL_LIB_VER.dylib +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + +if [ -f "$REPOSITORYDIR/lib/libaprutil-$FULL_LIB_VER.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libaprutil-$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libaprutil-$FULL_LIB_VER.dylib"; + ln -sfn libaprutil-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libaprutil-$EXT_MAIN_LIB_VER.dylib; + ln -sfn libaprutil-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libaprutil-$MAIN_LIB_VER.dylib; + ln -sfn libaprutil-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libaprutil.dylib; +fi + +#pkgconfig +for ARCH in $ARCHS +do + mkdir -p "$REPOSITORYDIR/lib/pkgconfig"; + sed 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' "$REPOSITORYDIR/arch/$ARCH/lib/pkgconfig/aprutil-1.pc" > "$REPOSITORYDIR/lib/pkgconfig/aprutil-1.pc"; + break; +done + +#Copy shell script +for ARCH in $ARCHS +do + mkdir -p "$REPOSITORYDIR/bin"; + cp "$REPOSITORYDIR/arch/$ARCH/lib/aprutil.exp" "$REPOSITORYDIR/lib/aprutil.exp"; + break; +done + Added: hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/apr.sh 2008-08-13 19:13:19 UTC (rev 3316) @@ -0,0 +1,147 @@ +# ------------------ +# libapr +# ------------------ +# Based on the works of (c) 2007, Ippei Ukai +# Created for Tiger by Harry van der Wolf 2008 + +# download location http://apr.apache.org/ + +# prepare + +# export REPOSITORYDIR="/PATH2AVIDEMUX/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +MAIN_LIB_VER="1" +EXT_MAIN_LIB_VER="$MAIN_LIB_VER.0" +FULL_LIB_VER="$EXT_MAIN_LIB_VER.2.12" + +OTHERMAKEARGs="" + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --with-ssl --enable-shared --with-expat --mandir=$REPOSITORYDIR/share/man \ +; + + make clean; + #make + make $OTHERMAKEARGs; + make install; + + # apr build a build structure for all following utilies and so on. We need to move that to + # the arch directory + mv "$REPOSITORYDIR/build-1" "$REPOSITORYDIR/arch/$ARCH/build-1" + +done + + +# merge libapr + +for liba in lib/libapr-$MAIN_LIB_VER.a lib/libapr-$FULL_LIB_VER.dylib +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + +if [ -f "$REPOSITORYDIR/lib/libapr-$FULL_LIB_VER.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libapr-$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libapr-$FULL_LIB_VER.dylib"; + ln -sfn libapr-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libapr-$EXT_MAIN_LIB_VER.dylib; + ln -sfn libapr-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libapr-$MAIN_LIB_VER.dylib; + ln -sfn libapr-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libapr.dylib; +fi + +#pkgconfig +for ARCH in $ARCHS +do + mkdir -p "$REPOSITORYDIR/lib/pkgconfig"; + sed 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' "$REPOSITORYDIR/arch/$ARCH/lib/pkgconfig/apr-1.pc" > "$REPOSITORYDIR/lib/pkgconfig/apr-1.pc"; + break; +done + +#Copy shell script +for ARCH in $ARCHS +do + mkdir -p "$REPOSITORYDIR/bin"; + cp "$REPOSITORYDIR/arch/$ARCH/lib/apr.exp" "$REPOSITORYDIR/lib/apr.exp"; + sed 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' "$REPOSITORYDIR/arch/$ARCH/bin/apr-1-config" > "$REPOSITORYDIR/bin/apr-1-config"; + break; +done +chmod a+x "$REPOSITORYDIR/bin/apr-1-config" + Added: hugin/trunk/mac/ExternalPrograms/scripts/Tiger/gettext.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/gettext.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/gettext.sh 2008-08-13 19:13:19 UTC (rev 3316) @@ -0,0 +1,193 @@ +# ------------------ +# gettext +# ------------------ +# Based on the works of (c) 2007, Ippei Ukai +# Created for Tiger by Harry van der Wolf 2008 + +# download location ftp.gnu.org/gnu/gettext/ + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +GETTEXTVER_M="0" +GEETTEXTVER_FULL="$GETTEXTVER_M.17" +MAIN_LIB_VER="0" +FULL_LIB_VER="$MAIN_LIB_VER.17" + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + +# export PATH=/usr/bin:$PATH + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include -no-cpp-precomp" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-shared --disable-csharp --without-emacs \ + --with-included-gettext --with-included-glib \ + --with-included-libxml --without-examples \ + --with-included-libcroco \ +; + + + make clean; + make; + make install; + +done + + +# merge libgettext + +for liba in lib/libgettext.a lib/libgettextlib-$FULL_LIB_VER.dylib lib/libgettextpo.0.4.0.dylib lib/libgettextsrc-$FULL_LIB_VER.dylib lib/libasprintf.0.0.0.dylib lib/libasprintf.a lib/libintl.8.0.2.dylib lib/libintl.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + +if [ -f "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" + ln -sfn libgettextlib-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libgettextlib.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" + ln -sfn libgettextsrc-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libgettextsrc.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libgettextpo.0.4.0.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libgettextpo.0.4.0.dylib" "$REPOSITORYDIR/lib/libgettextpo.0.4.0.dylib" + ln -sfn libgettextpo.0.4.0.dylib $REPOSITORYDIR/lib/libgettextpo.0.dylib; + ln -sfn libgettextpo.0.4.0.dylib $REPOSITORYDIR/lib/libgettextpo.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libasprintf.0.0.0.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libasprintf.0.0.0.dylib" "$REPOSITORYDIR/lib/libasprintf.0.0.0.dylib" + ln -sfn libasprintf.0.0.0.dylib $REPOSITORYDIR/lib/libasprintf.0.dylib; + ln -sfn libasprintf.0.0.0.dylib $REPOSITORYDIR/lib/libasprintf.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libintl.8.0.2.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libintl.8.0.2.dylib" "$REPOSITORYDIR/lib/libintl.8.0.2.dylib" + ln -sfn libintl.8.0.2.dylib $REPOSITORYDIR/lib/libintl.8.dylib; + ln -sfn libintl.8.0.2.dylib $REPOSITORYDIR/lib/libintl.dylib; +fi + +#Copy shell script +for ARCH in $ARCHS +do + mkdir -p "$REPOSITORYDIR/bin"; + cp "$REPOSITORYDIR/arch/$ARCH/bin/gettext.sh" "$REPOSITORYDIR/bin/gettext.sh"; + sed 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' "$REPOSITORYDIR/arch/$ARCH/bin/gettextize" > "$REPOSITORYDIR/bin/gettextize"; + sed 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' "$REPOSITORYDIR/arch/$ARCH/bin/autopoint" > "$REPOSITORYDIR/bin/autopoint"; + break; +done +chmod a+x "$REPOSITORYDIR/bin/gettextize" "$REPOSITORYDIR/bin/autopoint" + + +# merge execs +for program in bin/gettext bin/ngettext bin/xgettext bin/msgattrib bin/msgcmp bin/msgconv bin/msgexec bin/msgfmt bin/msginit bin/msgunfmt bin/msgcat bin/msgcomm bin/msgen bin/msgfilter bin/msggrep bin/msgmerge bin/msguniq bin/envsubst bin/recode-sr-latin +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + strip "$REPOSITORYDIR/$program"; + +done + + + Added: hugin/trunk/mac/ExternalPrograms/scripts/Tiger/libneon.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/libneon.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/libneon.sh 2008-08-13 19:13:19 UTC (rev 3316) @@ -0,0 +1,124 @@ +# ------------------ +# libneon +# ------------------ +# Based on the works of (c) 2007, Ippei Ukai +# Created for Tiger by Harry van der Wolf 2008 + +# download location http://www.webdav.org/neon/ + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +MAIN_LIB_VER="26" +FULL_LIB_VER="$MAIN_LIB_VER.0.4" + +OTHERMAKEARGs="" + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + export PATH=/usr/bin:$PATH + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-shared \ + --with-ssl --enable-shared --with-expat --mandir=$REPOSITORYDIR/share/man \ +; + + make clean; + #make + make $OTHERMAKEARGs; + make install; + +done + + +# merge libneon + +for liba in lib/libneon.a lib/libneon.$FULL_LIB_VER.dylib +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + +if [ -f "$REPOSITORYDIR/lib/libneon.$FULL_LIB_VER.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libneon.$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libneon.$FULL_LIB_VER.dylib" + ln -sfn libneon.$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libneon.$MAIN_LIB_VER.dylib; + ln -sfn libneon.$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libneon.dylib; +fi Added: hugin/trunk/mac/ExternalPrograms/scripts/Tiger/subversion.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/Tiger/subversion.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/Tiger/subversion.sh 2008-08-13 19:13:19 UTC (rev 3316) @@ -0,0 +1,125 @@ +# ------------------ +# subversion 1.5.1 +# ------------------ +# $Id: subversion.sh 1908 2007-02-05 14:59:45Z ippei $ +# Copyright (c) 2007, Ippei Ukai +# Created for Tiger by Harry van der Wolf + +# download location http://subversion.tigris.org/ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --with-neon="$REPOSITORYDIR" \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --without-berkeley-db \ + --with-apr=$REPOSITORYDIR --with-apr-util=$REPOSITORYDIR/arch/$ARCH --without-apxs --disable-neon-version-check \ + ; + + + + make clean; + make $OTHERMAKEARGs all; + make install; + +done + + +# merge execs + +for program in bin/svn bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnserve bin/svnsync bin/svnsersion +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + #strip "$REPOSITORYDIR/$program"; + +done + +# strip only 32bit for now; it appears one of our 64bit library gets namespace wrong. +for ARCH in i386 i686 ppc ppc750 ppc7400 +do + for program in bin/enblend bin/enfuse + do + strip -arch $ARCH "$REPOSITORYDIR/$program" + done +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2008-08-17 10:32:21
|
Revision: 3325 http://hugin.svn.sourceforge.net/hugin/?rev=3325&view=rev Author: harryvanderwolf Date: 2008-08-17 10:32:18 +0000 (Sun, 17 Aug 2008) Log Message: ----------- [Mac]wxmac script adaptations: Install modified wx-config in bin Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/wxmac28-debug.sh hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/wxmac28-debug.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/wxmac28-debug.sh 2008-08-16 03:27:33 UTC (rev 3324) +++ hugin/trunk/mac/ExternalPrograms/scripts/wxmac28-debug.sh 2008-08-17 10:32:18 UTC (rev 3325) @@ -206,6 +206,13 @@ done +#wx-config +for ARCH in $ARCHS +do + sed -e 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' -e 's/-arch '$ARCH'//' $REPOSITORYDIR/arch/$ARCH/bin/wx-config > $REPOSITORYDIR/bin/wx-config + break; +done + Modified: hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh 2008-08-16 03:27:33 UTC (rev 3324) +++ hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh 2008-08-17 10:32:18 UTC (rev 3325) @@ -208,5 +208,10 @@ done +#wx-config - +for ARCH in $ARCHS +do + sed -e 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' -e 's/^is_cross \&\& target.*$//' -e 's/-arch '$ARCH'//' $REPOSITORYDIR/arch/$ARCH/bin/wx-config > $REPOSITORYDIR/bin/wx-config + break; +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-09-30 09:01:28
|
Revision: 3461 http://hugin.svn.sourceforge.net/hugin/?rev=3461&view=rev Author: ippei Date: 2008-09-30 09:01:12 +0000 (Tue, 30 Sep 2008) Log Message: ----------- Mac: libpng update. Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libpng.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2008-09-27 15:21:22 UTC (rev 3460) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2008-09-30 09:01:12 UTC (rev 3461) @@ -20,7 +20,7 @@ -PNGVER="1.2.31" +PNGVER="1.2.32" # init @@ -45,12 +45,18 @@ then sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ -e "s/CC=cc/CC=$CC/" \ - -e 's/_version \$(PNGVER)/_version \$(PNGMIN)/g' \ + -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ + -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ + -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ + -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ scripts/makefile.darwin > makefile; else sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ -e 's/CC=cc/CC=gcc/' \ - -e 's/_version \$(PNGVER)/_version \$(PNGMIN)/g' \ + -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ + -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ + -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ + -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ scripts/makefile.darwin > makefile; fi @@ -151,12 +157,12 @@ if [ -f "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" ] then install_name_tool -id "$REPOSITORYDIR/lib/libpng12.1.dylib" "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" - ln -sfn libpng12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.12.dylib; - ln -sfn libpng12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.dylib; + ln -sfn libpng12.12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.12.dylib; + ln -sfn libpng12.12.dylib $REPOSITORYDIR/lib/libpng12.dylib; fi if [ -f "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ] then install_name_tool -id "$REPOSITORYDIR/lib/libpng.3.dylib" "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ln -sfn libpng.3.$PNGVER.dylib $REPOSITORYDIR/lib/libpng.3.dylib; - ln -sfn libpng.3.$PNGVER.dylib $REPOSITORYDIR/lib/libpng.dylib; + ln -sfn libpng.3.dylib $REPOSITORYDIR/lib/libpng.dylib; fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/static/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/static/libpng.sh 2008-09-27 15:21:22 UTC (rev 3460) +++ hugin/trunk/mac/ExternalPrograms/scripts/static/libpng.sh 2008-09-30 09:01:12 UTC (rev 3461) @@ -34,7 +34,15 @@ # compile -cp scripts/makefile.darwin makefile; +# makefile.darwin +if [ $CC != "" ] +then + sed -e "s/CC=cc/CC=$CC/" \ + scripts/makefile.darwin > makefile; +else + sed -e 's/CC=cc/CC=gcc/' \ + scripts/makefile.darwin > makefile; +fi # patch pngconf.h patch -bf -i $(dirname $0)/../pngconf_h.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-09-30 22:47:21
|
Revision: 3465 http://hugin.svn.sourceforge.net/hugin/?rev=3465&view=rev Author: ippei Date: 2008-09-30 22:47:04 +0000 (Tue, 30 Sep 2008) Log Message: ----------- Mac: enblend 3.2 released Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh Removed Paths: ------------- hugin/trunk/mac/ExternalPrograms/scripts/enblend3.sh hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh Copied: hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh (from rev 3460, hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh) =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh 2008-09-30 22:47:04 UTC (rev 3465) @@ -0,0 +1,124 @@ +# ------------------ +# enblend 3.2 +# ------------------ +# $Id: enblend3.sh 1908 2007-02-05 14:59:45Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ + ; + + # hack; AC_FUNC_MALLOC sucks!! + mv "./config.h" "./config.h-copy"; + sed -e 's/HAVE_MALLOC\ 0/HAVE_MALLOC\ 1/' \ + -e 's/rpl_malloc/malloc/' \ + "./config.h-copy" > "./config.h"; + + # well, I prefer -O2 + mv src/Makefile src/Makefile.copy + sed 's/-O3/-O2/g' src/Makefile.copy > src/Makefile + + make clean; + make $OTHERMAKEARGs all; + make install; + +done + + +# merge execs + +for program in bin/enblend bin/enfuse +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + #strip "$REPOSITORYDIR/$program"; + +done + +for program in bin/enblend bin/enfuse +do + strip -x "$REPOSITORYDIR/$program" +done Deleted: hugin/trunk/mac/ExternalPrograms/scripts/enblend3.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend3.sh 2008-09-30 15:59:37 UTC (rev 3464) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend3.sh 2008-09-30 22:47:04 UTC (rev 3465) @@ -1,103 +0,0 @@ -# ------------------ -# enblend 3.0 -# ------------------ -# $Id: enblend3.sh 1908 2007-02-05 14:59:45Z ippei $ -# Copyright (c) 2007, Ippei Ukai - -# prepare - -# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ -# ARCHS="ppc i386" \ -# ppcTARGET="powerpc-apple-darwin7" \ -# i386TARGET="i386-apple-darwin8" \ -# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ -# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ -# ppcONLYARG="-mcpu=G3 -mtune=G4" \ -# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ -# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ -# OTHERARGs=""; - - - -# init - -let NUMARCH="0" - -for i in $ARCHS -do - NUMARCH=$(($NUMARCH + 1)) -done - -mkdir -p "$REPOSITORYDIR/bin"; -mkdir -p "$REPOSITORYDIR/lib"; -mkdir -p "$REPOSITORYDIR/include"; - -# compile - -for ARCH in $ARCHS -do - - mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; - mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; - mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; - - ARCHARGs="" - MACSDKDIR="" - - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppc64ONLYARG" - fi - - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include -I/System/Library/Frameworks/GLUT.framework/Headers -I/System/Library/Frameworks/OpenGL.framework/Headers" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ - LIBS="-lz -ljpeg -framework GLUT -framework OpenGL -framework AGL" \ - NEXT_ROOT="$MACSDKDIR" \ - ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - ; - - make clean; - make install; - -done - - -# merge execs - -for program in bin/enblend -do - - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue - fi - - LIPOARGs="" - - for ARCH in $ARCHS - do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" - done - - lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; - - strip "$REPOSITORYDIR/$program"; - -done Deleted: hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh 2008-09-30 15:59:37 UTC (rev 3464) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh 2008-09-30 22:47:04 UTC (rev 3465) @@ -1,124 +0,0 @@ -# ------------------ -# enblend 3.1 -# ------------------ -# $Id: enblend3.sh 1908 2007-02-05 14:59:45Z ippei $ -# Copyright (c) 2007, Ippei Ukai - -# prepare - -# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ -# ARCHS="ppc i386" \ -# ppcTARGET="powerpc-apple-darwin7" \ -# i386TARGET="i386-apple-darwin8" \ -# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ -# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ -# ppcONLYARG="-mcpu=G3 -mtune=G4" \ -# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ -# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ -# OTHERARGs=""; - - - -# init - -let NUMARCH="0" - -for i in $ARCHS -do - NUMARCH=$(($NUMARCH + 1)) -done - -mkdir -p "$REPOSITORYDIR/bin"; -mkdir -p "$REPOSITORYDIR/lib"; -mkdir -p "$REPOSITORYDIR/include"; - -# compile - -for ARCH in $ARCHS -do - - mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; - mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; - mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; - - ARCHARGs="" - MACSDKDIR="" - - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - fi - - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ - NEXT_ROOT="$MACSDKDIR" \ - PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ - ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ - ; - - # hack; AC_FUNC_MALLOC sucks!! - mv "./config.h" "./config.h-copy"; - sed -e 's/HAVE_MALLOC\ 0/HAVE_MALLOC\ 1/' \ - -e 's/rpl_malloc/malloc/' \ - "./config.h-copy" > "./config.h"; - - # well, I prefer -O2 - mv src/Makefile src/Makefile.copy - sed 's/-O3/-O2/g' src/Makefile.copy > src/Makefile - - make clean; - make $OTHERMAKEARGs all; - make install; - -done - - -# merge execs - -for program in bin/enblend bin/enfuse -do - - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue - fi - - LIPOARGs="" - - for ARCH in $ARCHS - do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" - done - - lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; - - #strip "$REPOSITORYDIR/$program"; - -done - -for program in bin/enblend bin/enfuse -do - strip -x "$REPOSITORYDIR/$program" -done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <har...@us...> - 2009-11-22 19:21:39
|
Revision: 4724 http://hugin.svn.sourceforge.net/hugin/?rev=4724&view=rev Author: harryvanderwolf Date: 2009-11-22 19:21:27 +0000 (Sun, 22 Nov 2009) Log Message: ----------- [OSX] massive update and improvement of OSX build scripts (thanks to Skip Gaede) Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/clens.sh hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13cm.sh hugin/trunk/mac/ExternalPrograms/scripts/panomatic.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libexiv2.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libxmi.sh hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2009-11-22 19:21:27 UTC (rev 4724) @@ -1,5 +1,5 @@ -# Configuration for 2 part universal build -# Copyright (c) 2007-2008, Ippei Ukai +# Configuration for 4 part universal build, only possible from Leopard +# Copyright (c) 2008, Ippei Ukai # has to be the absolute path from / @@ -7,30 +7,47 @@ # number of jobs that make can use, probably same as the number of CPUs. #PROCESSNUM=2 -PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +if [ $(uname -p) = i386 ] ; then + PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +else + PROCESSNUM="1" +fi - - mkdir -p $myREPOSITORYDIR; export \ REPOSITORYDIR="$myREPOSITORYDIR" \ + #ARCHS="ppc i386 ppc64 x86_64" \ ARCHS="ppc i386" \ \ - ppcTARGET="powerpc-apple-darwin8" \ + ppcTARGET="powerpc-apple-darwin10" \ ppcOSVERSION="10.4" \ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ + ppcOPTIMIZE="-m32 -mcpu=G3 -mtune=G4 -ftree-vectorize" \ ppcCC="gcc-4.0" \ ppcCXX="g++-4.0" \ \ - i386TARGET="i386-apple-darwin8" \ + i386TARGET="i686-apple-darwin10" \ 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" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + i386OPTIMIZE="-m32 -march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.2" \ + i386CXX="g++-4.2" \ \ + ppc64TARGET="powerpc64-apple-darwin10" \ + ppc64OSVERSION="10.5" \ + ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppc64OPTIMIZE="-m64 -mcpu=G5 -mtune=G5 -ftree-vectorize" \ + ppc64CC="gcc-4.2" \ + ppc64CXX="g++-4.2" \ + \ + x64TARGET="x86_64-apple-darwin10" \ + x64OSVERSION="10.5" \ + x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + x64OPTIMIZE="-m64 -march=core2 -mtune=core2 -ftree-vectorize" \ + x64CC="gcc-4.2" \ + x64CXX="g++-4.2" \ + \ OTHERARGs="" \ OTHERMAKEARGs="--jobs=$PROCESSNUM"; @@ -38,14 +55,9 @@ # Deprecated: export \ ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION"; + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ + x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; - -# cmake settings -export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" -export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" - - - -# $Id: SetEnv-universal.txt 1902 2007-02-04 22:27:47Z ippei $ +# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ Modified: hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -22,9 +22,20 @@ let NUMARCH="0" -for i in $ARCHS +# remove 64-bit archs from ARCHS +ARCHS_TMP=$ARCHS +ARCHS="" +for ARCH in $ARCHS_TMP do - NUMARCH=$(($NUMARCH + 1)) + if [ $ARCH = "i386" -o $ARCH = "i686" -o $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + NUMARCH=$(($NUMARCH + 1)) + if [ "$ARCHS" = "" ] ; then + ARCHS="$ARCH" + else + ARCHS="$ARCHS $ARCH" + fi + fi done mkdir -p "$REPOSITORYDIR/bin"; @@ -43,30 +54,34 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - OSVERSION=$i386OSVERSION - OPTIMIZE=$i386OPTIMIZE - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - OSVERSION=$ppcOSVERSION - OPTIMIZE=$ppcOPTIMIZE - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - OSVERSION=$ppc64OSVERSION - OPTIMIZE=$ppc64OPTIMIZE - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - OSVERSION=$x64OSVERSION - OPTIMIZE=$x64OPTIMIZE + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + OSVERSION=$i386OSVERSION + OPTIMIZE=$i386OPTIMIZE + export CC=$i386CC + export CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + OSVERSION=$ppcOSVERSION + OPTIMIZE=$ppcOPTIMIZE + export CC=$ppcCC + export CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + OSVERSION=$ppc64OSVERSION + OPTIMIZE=$ppc64OPTIMIZE + export CC=$ppc64CC + export CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + OSVERSION=$x64OSVERSION + OPTIMIZE=$x64OPTIMIZE + export CC=$x64CC + export CXX=$x64CXX fi @@ -76,35 +91,37 @@ # And what's wrong with just having autoconf's good old "--prefix=" behaviour? # Stupid CMake... - if [ -f "$REPOSITORYDIR/lib/libjpeg.dylib" ] - then + if [ -f "$REPOSITORYDIR/lib/libjpeg.dylib" ] ; then JPEG_EXT="dylib" else JPEG_EXT="a" fi - if [ -f "$REPOSITORYDIR/lib/libpng.dylib" ] - then + if [ -f "$REPOSITORYDIR/lib/libpng.dylib" ] ; then PNG_EXT="dylib" else PNG_EXT="a" fi - if [ -f "$REPOSITORYDIR/lib/libtiff.dylib" ] - then + if [ -f "$REPOSITORYDIR/lib/libtiff.dylib" ] ; then TIFF_EXT="dylib" else TIFF_EXT="a" fi - if [ -f "$REPOSITORYDIR/lib/libpano13.dylib" ] - then + if [ -f "$REPOSITORYDIR/lib/libpano13.dylib" ] ; then PANO13_EXT="dylib" else PANO13_EXT="a" fi rm CMakeCache.txt; + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" ; cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL="ON" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -28,7 +28,7 @@ cp -R "./boost" "$REPOSITORYDIR/include/"; -# compile bjab +# compile bjam cd "./tools/jam/src"; sh "build.sh"; @@ -139,20 +139,17 @@ mv ./stage-$ARCH/lib/libboost_system.a ./stage-$ARCH/lib/libboost_system-$BOOST_VER.a done -read pipo +#read pipo # merge libboost_thread libboost_filesystem libboost_system 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 ] - then + if [ $NUMARCH -eq 1 ] ; then mv "stage-$ARCH/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; continue fi @@ -164,31 +161,23 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done -if [ -f "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.a" ] -then - ln -sfn libboost_thread-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread.a; +if [ -f "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.a" ] ; then + ln -sfn libboost_thread-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread.a; fi -if [ -f "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib" ] ; then 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; +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 +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 - Added: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -0,0 +1,26 @@ +#! /bin/sh + +cd /Users/sgaede/development/hugin/mac/ExternalPrograms/scripts +cat SetEnv.txt +source SetEnv.txt + +echo building boost && cd ../boost_1_40_0 && sh ../scripts/boost.sh +echo building expat && cd ../expat-2.0.1 && sh ../scripts/libexpat.sh; +echo building gettext && cd ../gettext-0.17 && sh ../scripts/gettext.sh +echo building libjpeg-7 && cd ../jpeg-7 && sh ../scripts/libjpeg-7.sh; +echo building libpng && cd ../libpng-1.2.38 && sh ../scripts/libpng.sh; +echo building libtiff && cd ../tiff-3.8.2 && sh ../scripts/libtiff.sh; +echo building wxmac && cd ../wxMac-2.8.10 && sh ../scripts/wxmac28.sh; +echo building ilmbase && cd ../ilmbase-1.0.1 && sh ../scripts/ilmbase.sh; +echo building openexr && cd ../openexr-1.6.1 && sh ../scripts/openexr16.sh; +echo building libpano13 && cd ../libpano13-2.9.14 && sh ../scripts/pano13.sh; +echo building libexiv2 && cd ../exiv2-0.18.2 && sh ../scripts/static/libexiv2.sh; +echo building liblcms && cd ../lcms-1.17 && sh ../scripts/lcms.sh; +echo building libxmi && cd ../libxmi-1.2 && sh ../scripts/static/libxmi.sh; +echo building libglew && cd ../glew && sh ../scripts/static/libglew.sh; +echo building gnumake-119 && cd ../gnumake-119 && sh ../scripts/gnumake.sh; +echo building enblend-enfuse && cd ../enblend-enfuse-3.2 && sh ../scripts/enblend.sh; +echo building autopano-sift-C && cd ../autopano-sift-C && sh ../scripts/autopano-sift-C.sh; +echo building panomatic && cd ../panomatic-0.9.4 && sh ../scripts/panomatic.sh; + +echo "That's all, folks!!" Modified: hugin/trunk/mac/ExternalPrograms/scripts/clens.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/clens.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/clens.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -44,24 +44,29 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppc64ONLYARG" + CC=$ppc64CC + CXX=$ppc64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ @@ -89,8 +94,7 @@ for program in bin/clens do - if [ $NUMARCH -eq 1 ] - then + if [ $NUMARCH -eq 1 ] ; then mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; strip "$REPOSITORYDIR/$program"; continue Modified: hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -44,40 +44,47 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ - NEXT_ROOT="$MACSDKDIR" \ - PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ - ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ - ; + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ + ; # hack; AC_FUNC_MALLOC sucks!! - mv "./config.h" "./config.h-copy"; + + mv ./config.h ./config.h-copy; sed -e 's/HAVE_MALLOC\ 0/HAVE_MALLOC\ 1/' \ -e 's/rpl_malloc/malloc/' \ "./config.h-copy" > "./config.h"; @@ -87,9 +94,9 @@ sed 's/-O3/-O2/g' src/Makefile.copy > src/Makefile make clean; - make $OTHERMAKEARGs all; + make all; make install; - + done @@ -98,22 +105,20 @@ for program in bin/enblend bin/enfuse do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; - #strip "$REPOSITORYDIR/$program"; done Modified: hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -55,45 +55,50 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" - elif [ $ARCH = "x86_64" ] - then + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi # first patch the make file #patch -po < patch-gettext-tools-Makefile.in -export PATH=/usr/bin:$PATH + export PATH=/usr/bin:$PATH - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include -no-cpp-precomp" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -L/usr/lib -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared --enable-static --disable-csharp \ - --with-included-gettext --with-included-glib \ - --with-included-libxml --without-examples \ - --with-included-libcroco --without-emacs \ -; + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-shared --enable-static --disable-csharp \ + --with-included-gettext --with-included-glib \ + --with-included-libxml --without-examples --with-libexpat-prefix=$REPOSITORYDIR \ + --with-included-libcroco --without-emacs --with-libiconf-prefix=$MACSDKDIR/usr ; # read input; make clean; @@ -103,16 +108,16 @@ done - # merge libgettext -for liba in lib/libgettext.a lib/libgettextlib-$FULL_LIB_VER.dylib lib/libgettextpo.$GETTEXTVERPO_F.dylib lib/libgettextsrc-$FULL_LIB_VER.dylib lib/libasprintf.$ASPRINTFVER_F.dylib lib/libasprintf.a lib/libintl.$LIBINTLVER_F.dylib lib/libintl.a +#for liba in lib/libgettext.a lib/libgettextlib-$FULL_LIB_VER.dylib lib/libgettextpo.$GETTEXTVERPO_F.dylib lib/libgettextsrc-$FULL_LIB_VER.dylib lib/libasprintf.$ASPRINTFVER_F.dylib lib/libasprintf.a lib/libintl.$LIBINTLVER_F.dylib lib/libintl.a +for liba in lib/libgettextlib-$FULL_LIB_VER.dylib lib/libgettextpo.$GETTEXTVERPO_F.dylib lib/libgettextsrc-$FULL_LIB_VER.dylib lib/libasprintf.$ASPRINTFVER_F.dylib lib/libasprintf.a lib/libintl.$LIBINTLVER_F.dylib lib/libintl.a do - if [ $NUMARCH -eq 1 ] - then + if [ $NUMARCH -eq 1 ] ; then mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - ranlib "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; continue fi @@ -124,38 +129,35 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - ranlib "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + done -if [ -f "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libgettextlib-$FULL_LIB_VER.dylib" ln -sfn libgettextlib-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libgettextlib.dylib; fi -if [ -f "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" "$REPOSITORYDIR/lib/libgettextsrc-$FULL_LIB_VER.dylib" ln -sfn libgettextsrc-$FULL_LIB_VER.dylib $REPOSITORYDIR/lib/libgettextsrc.dylib; fi -if [ -f "$REPOSITORYDIR/lib/libgettextpo.$GETTEXTVERPO_F.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libgettextpo.$GETTEXTVERPO_F.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libgettextpo.$GETTEXTVERPO_F.dylib" "$REPOSITORYDIR/lib/libgettextpo.$GETTEXTVERPO_F.dylib" ln -sfn libgettextpo.$GETTEXTVERPO_F.dylib $REPOSITORYDIR/lib/libgettextpo.0.dylib; ln -sfn libgettextpo.$GETTEXTVERPO_F.dylib $REPOSITORYDIR/lib/libgettextpo.dylib; fi -if [ -f "$REPOSITORYDIR/lib/libasprintf.$ASPRINTFVER_F.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libasprintf.$ASPRINTFVER_F.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libasprintf.$ASPRINTFVER_F.dylib" "$REPOSITORYDIR/lib/libasprintf.$ASPRINTFVER_F.dylib" ln -sfn libasprintf.$ASPRINTFVER_F.dylib $REPOSITORYDIR/lib/libasprintf.0.dylib; ln -sfn libasprintf.$ASPRINTFVER_F.dylib $REPOSITORYDIR/lib/libasprintf.dylib; fi -if [ -f "$REPOSITORYDIR/lib/libintl.8.0.2.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libintl.8.0.2.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libintl.$LIBINTLVER_F.dylib" "$REPOSITORYDIR/lib/libintl.$LIBINTLVER_F.dylib" ln -sfn libintl.$LIBINTLVER_F.dylib $REPOSITORYDIR/lib/libintl.8.dylib; ln -sfn libintl.$LIBINTLVER_F.dylib $REPOSITORYDIR/lib/libintl.dylib; @@ -177,8 +179,7 @@ for program in bin/gettext bin/ngettext bin/xgettext bin/msgattrib bin/msgcmp bin/msgconv bin/msgexec bin/msgfmt bin/msginit bin/msgunfmt bin/msgcat bin/msgcomm bin/msgen bin/msgfilter bin/msggrep bin/msgmerge bin/msguniq bin/envsubst bin/recode-sr-latin do - if [ $NUMARCH -eq 1 ] - then + if [ $NUMARCH -eq 1 ] ; then mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; strip "$REPOSITORYDIR/$program"; continue Modified: hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -23,15 +23,13 @@ let NUMARCH="0" -for i in $ARCHS -do - NUMARCH=$(($NUMARCH + 1)) -done - mkdir -p "$REPOSITORYDIR/bin"; mkdir -p "$REPOSITORYDIR/lib"; mkdir -p "$REPOSITORYDIR/include"; +#patch +make install_source +cd ./make # compile @@ -42,7 +40,13 @@ do if [ $ARCH = "i386" -o $ARCH = "i686" -o $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then - ARCHS="$ARCHS $ARCH" + NUMARCH=$(($NUMARCH + 1)) + if [ -n "$ARCHS" ] + then + ARCHS="$ARCHS $ARCH" + else + ARCHS=$ARCH + fi fi done @@ -61,23 +65,30 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" + CC=$ppcCC + CXX=$ppcCXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --program-transform-name='s/^make$/gnumake/'; + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --program-transform-name='s/^make$/gnumake/'; make clean; + make; make install; done @@ -88,23 +99,22 @@ for program in bin/gnumake do - LIPOARGs="" + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCH/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + break; + else - for ARCH in $ARCHS - do - - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" - - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCH/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - break; - else - lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; + LIPOARGs="" + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; fi - done +done -done +cd ../ Modified: hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -34,17 +34,12 @@ g++ "./Half/eLut.cpp" -o "./Half/eLut-native" g++ "./Half/toFloat.cpp" -o "./Half/toFloat-native" -if [ -f "./Half/Makefile.in-original" ] -then - echo "original already exists!"; -else - mv "./Half/Makefile.in" "./Half/Makefile.in-original" -fi + +[ -f "./Half/Makefile.in-original" ] || mv "./Half/Makefile.in" "./Half/Makefile.in-original" sed -e 's/\.\/eLut/\.\/eLut-native/' \ -e 's/\.\/toFloat/\.\/toFloat-native/' \ "./Half/Makefile.in-original" > "./Half/Makefile.in" - # compile ILMVER_M="6" @@ -65,44 +60,54 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared --enable-static; + --enable-shared --enable-static --cache-file=./$ARCHcache; - mv "libtool" "libtool-bk"; - sed -e "s/-dynamiclib/-dynamiclib -arch $ARCH -isysroot $(echo $MACSDKDIR | sed 's/\//\\\//g')/g" "libtool-bk" > "libtool"; + [ -f "libtool-bk" ] || mv "libtool" "libtool-bk"; # just move it once, fix it many times + sed -e "s#-dynamiclib#-dynamiclib -arch $ARCH -isysroot $MACSDKDIR#g" libtool-bk > libtool; + chmod +x libtool #hack for apple-gcc 4.2 - if [ $CC != "" ] - then - for dir in Half Iex IlmThread Imath - do - mv $dir/Makefile $dir/Makefile.bk - sed 's/-Wno-long-double//g' $dir/Makefile.bk > $dir/Makefile - done + if [ ${CC#*-} = 4.2 ] ; then + for dir in Half Iex IlmThread Imath + do + mv $dir/Makefile $dir/Makefile.bk + sed 's/-Wno-long-double//g' $dir/Makefile.bk > $dir/Makefile + done fi make clean; @@ -119,13 +124,10 @@ for liba in $(for libname in $LIBNAMES; do echo "lib/lib$libname.a lib/lib$libname.$ILMVER_FULL.dylib "; done) do - if [ $NUMARCH -eq 1 ] - then + if [ $NUMARCH -eq 1 ] ; then mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; continue fi @@ -137,10 +139,8 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done @@ -156,8 +156,9 @@ for libname_two in $LIBNAMES do install_name_tool \ - -change "$REPOSITORYDIR/arch/$ARCH/lib/lib$libname_two.$ILMVER_M.dylib" "$REPOSITORYDIR/lib/lib$libname_two.$ILMVER_M.dylib" \ - "$REPOSITORYDIR/lib/lib$libname.$ILMVER_FULL.dylib"; + -change "$REPOSITORYDIR/arch/$ARCH/lib/lib$libname_two.$ILMVER_M.dylib" \ + "$REPOSITORYDIR/lib/lib$libname_two.$ILMVER_M.dylib" \ + "$REPOSITORYDIR/lib/lib$libname.$ILMVER_FULL.dylib"; done done Modified: hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -49,42 +49,49 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then + CC=$x64CC + CXX=$x64CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" - elif [ $ARCH = "x86_64" ] - then + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-static --enable-shared; + --enable-static --enable-shared --with-zlib=$MACSDKDIR/usr/lib ; make clean + make make $OTHERMAKEARGs install done @@ -95,14 +102,11 @@ for liba in lib/liblcms.a lib/liblcms.$LCMSVER_FULL.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" @@ -113,10 +117,8 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -31,8 +31,8 @@ mkdir -p "$REPOSITORYDIR/lib"; mkdir -p "$REPOSITORYDIR/include"; -EXIV2VER_M="2" -EXIV2VER_FULL="$EXIV2VER_M.1.0" +EXIV2VER_M="5" +EXIV2VER_FULL="$EXIV2VER_M.3.1" # compile @@ -47,39 +47,47 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then + CC=$x64CC + CXX=$x64CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" - elif [ $ARCH = "x86_64" ] - then + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared; + --enable-shared --with-libiconv-prefix=$REPOSITORYDIR --with-libintl-prefix=$REPOSITORYDIR \ + ; - mv "libtool" "libtool-bk"; - sed -e "s/-dynamiclib/-shared-libgcc -dynamiclib -arch $ARCH -isysroot $(echo $MACSDKDIR | sed 's/\//\\\//g')/g" -e 's/-all_load//g' "libtool-bk" > "libtool"; + [ -f "libtool-bk" ] || mv "libtool" "libtool-bk"; # just move it once, fix it many times + sed -e "s#-dynamiclib#-shared-libgcc -dynamiclib -arch $ARCH -isysroot $MACSDKDIR#g" \ + -e 's/-all_load//g' "libtool-bk" > "libtool"; chmod +x libtool make clean; @@ -101,14 +109,11 @@ for liba in lib/libexiv2.a lib/libexiv2.$EXIV2VER_FULL.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" @@ -119,10 +124,8 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done @@ -136,7 +139,6 @@ #pkgconfig - for ARCH in $ARCHS do mkdir -p $REPOSITORYDIR/lib/pkgconfig @@ -144,4 +146,3 @@ break; done - Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -18,6 +18,15 @@ # OTHERARGs=""; +uname_release=$(uname -r) +uname_arch=$(uname -p) +os_dotvsn=${uname_release%%.*} +os_dotvsn=$(($os_dotvsn - 4)) +NATIVE_SDKDIR="/Developer/SDKs/MacOSX10.$os_dotvsn.sdk" +NATIVE_OSVERSION="10.$os_dotvsn" +NATIVE_ARCH=$uname_arch +NATIVE_OPTIMIZE="" + # init let NUMARCH="0" @@ -31,6 +40,7 @@ mkdir -p "$REPOSITORYDIR/lib"; mkdir -p "$REPOSITORYDIR/include"; +# Generated library claims to be 1.5.2 for the 2.0.1 sources EXPATVER_M="1" EXPATVER_FULL="$EXPATVER_M.5.2" @@ -47,37 +57,51 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then + CC=$x64CC + CXX=$x64CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" - elif [ $ARCH = "x86_64" ] - then + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + # Configure is looking for a specific version of crt1.o based on what the compiler was built for + # This library isn't in the search path, so copy it to lib + crt1obj=lib/crt1.$NATIVE_OSVERSION.o + [ -f $REPOSITORYDIR/$crt1obj ] || cp $NATIVE_SDK/usr/$crt1obj $REPOSITORYDIR/$crt1obj ; + # File exists for 10.5 and 10.6. 10.4 is a problem + [ -f $REPOSITORYDIR/$crt1obj ] || exit 1 ; + + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --enable-shared; + [ -f $REPOSITORYDIR/$crt1obj ] && rm $REPOSITORYDIR/$crt1obj; make clean; make $OTHERMAKEARGs buildlib; make installlib; @@ -90,14 +114,11 @@ for liba in lib/libexpat.a lib/libexpat.$EXPATVER_FULL.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" @@ -108,16 +129,13 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done -if [ -f "$REPOSITORYDIR/lib/libexpat.$EXPATVER_FULL.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libexpat.$EXPATVER_FULL.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libexpat.$EXPATVER_FULL.dylib" "$REPOSITORYDIR/lib/libexpat.$EXPATVER_FULL.dylib" ln -sfn libexpat.$EXPATVER_FULL.dylib $REPOSITORYDIR/lib/libexpat.$EXPATVER_M.dylib; ln -sfn libexpat.$EXPATVER_FULL.dylib $REPOSITORYDIR/lib/libexpat.dylib; -fi \ No newline at end of file +fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -1,7 +1,7 @@ # ------------------ # libjpeg # ------------------ -# $Id: libjpeg.sh 1902 2007-02-04 22:27:47Z ippei $ +# $Id: libjpeg-7.sh 1902 2007-02-04 22:27:47Z ippei $ # Copyright (c) 2007, Ippei Ukai @@ -17,6 +17,7 @@ # i386ONLYARG="-march=prescott -mtune=pentium-m -ftree-vectorize -mmacosx-version-min=10.4" \ # OTHERARGs=""; +JPEGLIBVER="7" # init @@ -34,8 +35,10 @@ # compile -# update some of libtool stuff -cp /usr/share/libtool/config* ./; +# update some of libtool stuff: config.guess and config.sub -- location has changed between 10.5 and 10.6 +path="/usr/share/libtool"; +[ -d "${path}/config" ] && path="${path}/config"; +cp -v ${path}/config.{guess,sub} ./; for ARCH in $ARCHS do @@ -47,46 +50,45 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - export CC=$I386CC; - export CXX=$I386CXX; -elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then + CC=$x64CC + CXX=$x64CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - export CC=$ppcCC; - export CXX=$ppcCXX; - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" - export CC=$ppc64CC; - export CXX=$ppc64CXX; - elif [ $ARCH = "x86_64" ] - then + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" - export CC=$x64CC; - export CXX=$x64CXX; + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -L$MACSDKDIR/usr/lib -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared --enable-static; + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-shared --enable-static; make clean; + make; make install; done @@ -94,17 +96,14 @@ # merge libjpeg -for liba in lib/libjpeg.a lib/libjpeg.7.dylib +for liba in lib/libjpeg.a lib/libjpeg.$JPEGLIBVER.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" @@ -115,15 +114,12 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - done -if [ -f "$REPOSITORYDIR/lib/libjpeg.7.dylib" ] -then - ln -sfn "libjpeg.7.dylib" "$REPOSITORYDIR/lib/libjpeg.dylib"; +if [ -f "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" ] ; then + install_name_tool \ + -id "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" \ + "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib"; + ln -sfn "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" "$REPOSITORYDIR/lib/libjpeg.dylib"; fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -34,8 +34,10 @@ # compile -# update some of libtool stuff -cp /usr/share/libtool/config* ./; +# update some of libtool stuff: config.guess and config.sub -- location has changed between 10.5 and 10.6 +path="/usr/share/libtool"; +[ -d "${path}/config" ] && path="${path}/config"; +cp -v ${path}/config.{guess,sub} ./; for ARCH in $ARCHS do @@ -52,38 +54,46 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ - NEXT_ROOT="$MACSDKDIR" \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --disable-shared --enable-static; make clean; + make make install-lib; # the old config-make stuff do not create shared library well. Best do it by hand. rm "libjpeg.62.0.0.dylib"; - gcc -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip \ + $CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip \ -dynamiclib -flat_namespace -undefined suppress \ -lmx -shared-libgcc -current_version 62.0.0 -compatibility_version 62.0.0\ -install_name "$REPOSITORYDIR/lib/libjpeg.62.dylib" -o libjpeg.62.0.0.dylib \ @@ -106,28 +116,23 @@ for liba in lib/libjpeg.a lib/libjpeg.62.0.0.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -20,15 +20,13 @@ -PNGVER="1.2.38" +PNGVER="1.2.40" # init let NUMARCH="0" - -for i in $ARCHS -do +for i in $ARCHS ; do NUMARCH=$(($NUMARCH + 1)) done @@ -39,34 +37,13 @@ # patch -# makefile.darwin -# includes hack for libpng bug #2009836 -if [ $CC != "" ] -then - sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ - -e "s/CC=cc/CC=$CC/" \ - -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ - -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ - -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ - -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ - scripts/makefile.darwin > makefile; -else - sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ - -e 's/CC=cc/CC=gcc/' \ - -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ - -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ - -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ - -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ - scripts/makefile.darwin > makefile; -fi - # pngconf.h if [ -f pngconf-bk.h ] then mv -f pngconf-bk.h pngconf.h fi cp pngconf.h pngconf-bk.h -patch < $(dirname $0)/pngconf_h.patch +patch < ../scripts/pngconf_h.patch # compile @@ -86,30 +63,62 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX fi + # makefile.darwin +# includes hack for libpng bug #2009836 +if [ -n $CC ] +then + sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ + -e "s/CC=.*/CC=$CC/" \ + -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ + -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ + -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ + -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ + scripts/makefile.darwin > makefile; +else + sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ + -e 's/CC=cc/CC=gcc/' \ + -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ + -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ + -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ + -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ + scripts/makefile.darwin > makefile; +fi + make clean; make $OTHERMAKEARGs install-static install-shared \ prefix="$REPOSITORYDIR" \ ZLIBLIB="$MACSDKDIR/usr/lib" \ ZLIBINC="$MACSDKDIR/usr/include" \ + CC="$CC" CXX="$CXX" \ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng12 -lz" \ + OBJCFLAGS="-arch $ARCH" \ + OBJCXXFLAGS="-arch $ARCH" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L. -isysroot $MACSDKDIR -arch $ARCH -lpng12 -lz" \ NEXT_ROOT="$MACSDKDIR" \ LIBPATH="$REPOSITORYDIR/arch/$ARCH/lib" \ BINPATH="$REPOSITORYDIR/arch/$ARCH/bin" \ @@ -117,51 +126,40 @@ done - # merge libpng for liba in lib/libpng12.a lib/libpng12.12.$PNGVER.dylib lib/libpng.3.$PNGVER.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; done - -if [ -f "$REPOSITORYDIR/lib/libpng12.a" ] -then - ln -sfn libpng12.a $REPOSITORYDIR/lib/libpng.a; +if [ -f "$REPOSITORYDIR/lib/libpng12.a" ] ; then + ln -sfn libpng12.a $REPOSITORYDIR/lib/libpng.a; fi - -if [ -f "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libpng12.1.dylib" "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" ln -sfn libpng12.12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.12.dylib; ln -sfn libpng12.12.dylib $REPOSITORYDIR/lib/libpng12.dylib; fi -if [ -f "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ] -then +if [ -f "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libpng.3.dylib" "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ln -sfn libpng.3.$PNGVER.dylib $REPOSITORYDIR/lib/libpng.3.dylib; ln -sfn libpng.3.dylib $REPOSITORYDIR/lib/libpng.dylib; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2009-11-20 23:10:43 UTC (rev 4723) +++ hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2009-11-22 19:21:27 UTC (rev 4724) @@ -18,6 +18,15 @@ # OTHERARGs=""; +uname_release=$(uname -r) +uname_arch=$(uname -p) +os_dotvsn=${uname_release%%.*} +os_dotvsn=$(($os_dotvsn - 4)) +NATIVE_SDKDIR="/Developer/SDKs/MacOSX10.$os_dotvsn.sdk" +NATIVE_OSVERSION="10.$os_dotvsn" +NATIVE_ARCH=$uname_arch +NATIVE_OPTIMIZE="" + # init let NUMARCH="0" @@ -31,7 +40,6 @@ mkdir -p "$REPOSITORYDIR/lib"; mkdir -p "$REPOSITORYDIR/include"; - # compile for ARCH in $ARCHS @@ -49,45 +57,52 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" - export CC=$I386CC; - export CXX=$I386CXX; + CC=$i386CC; + CXX=$i386CXX; elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" - export CC=$ppcCC; - export CXX=$ppcCXX; + CC=$ppcCC; + CXX=$ppcCXX; elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" - export CC=$ppc64CC; - export CXX=$ppc64CXX; + CC=$ppc64CC; + CXX=$ppc64CXX; elif [ $ARCH = "x86_64" ] then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" - export CC=$x64CC; - export CXX=$x64CXX; + CC=$x64CC; + CXX=$x64CXX; fi - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ - NEXT_ROOT="$MACSDKDIR" \ - ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-static --enable-shared --with-apple-opengl-framework --without-x \ - ; + # Configure is looking for a specific version of crt1.o based on what the compiler was built for + # This library isn't in the search path, so copy it to lib + crt1obj=lib/crt1.$NATIVE_OSVERSION.o + [ -f $REPOSITORYDIR/$crt1obj ] || cp $NATIVE_SDK/usr/$crt1obj $REPOSITORYDIR/$crt1obj ; + # File exists for 10.5 and 10.6. 10.4 is a problem + [ -f $REPOSITORYDIR/$crt1obj ] || exit 1 ; -# --enable-largefile --with-zlib-lib-dir=/usr/lib --with-zlib-include-dir=/usr/include \ + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-static --enable-shared --with-apple-opengl-framework --without-x \ + --with-zlib-dir=$MACSDKDIR/usr/lib --with-zlib-include-dir=$MACSDKDIR/usr/include \ + ; -# read karakter - + [ -f $REPOSITORYDIR/$crt1obj ] && rm $REPOSITORYDIR/$crt1obj; make clean; cd ./port; make $OTHERMAKEARGs; cd ../libtiff; make $OTHERMAKEARGs install; @@ -104,97 +119,76 @@ for liba in lib/libtiff.a lib/libtiffxx.a lib/libtiff.3.dylib lib/libtiffxx.3.dylib do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - continue + if [ $NUMARCH -eq 1 ] ; then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - if [[ $liba == *.a ]] - then - ranlib "$REPOSITORYDIR/$liba"; - fi - done -if [ -f "$REPOSITORYDIR/lib/libtiff.3.dylib" ] -then - install_name_tool -id "$REPOSITORYDIR/lib/libtiff.3.dylib" "$REPOSITORYDIR/lib/libtiff.3.dylib"; - ln -sfn libtiff.3.dylib $REPOSITORYDIR/lib/libtiff.dylib; +if [ -f "$REPOSITORYDIR/lib/libtiff.3.dylib" ] ; then + install_name_tool -id "$REPOSITORYDIR/lib/libtiff.3.dylib" "$REPOSITORYDIR/lib/libtiff.3.dylib"; + ln -sfn libtiff.3.dylib $REPOSITORYDIR/lib/libtiff.dylib; fi -if [ -f "$REPOSITORYDIR/lib/libtiffxx.3.dylib" ] -then - install_name_tool -id "$REPOSITORYDIR/lib/libtiffxx.3.dylib" "$REPOSITORYDIR/lib/libtiffxx.3.dylib"; - for ARCH in $ARCHS - do - install_name_tool -change "$REPOSITORYDIR/arch/$A... [truncated message content] |
From: <ski...@us...> - 2009-12-08 02:35:30
|
Revision: 4754 http://hugin.svn.sourceforge.net/hugin/?rev=4754&view=rev Author: skipgaede Date: 2009-12-08 02:35:20 +0000 (Tue, 08 Dec 2009) Log Message: ----------- [OSX] Build scripts update used for 2009.4.0-RC3 build by Skip Gaede Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh hugin/trunk/mac/ExternalPrograms/scripts/clens.sh hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13cm.sh hugin/trunk/mac/ExternalPrograms/scripts/panomatic.sh hugin/trunk/mac/ExternalPrograms/scripts/static/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/static/dmalloc.sh hugin/trunk/mac/ExternalPrograms/scripts/static/ilmbase.sh hugin/trunk/mac/ExternalPrograms/scripts/static/lcms.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libexiv2.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libexpat.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libglew.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libjpeg.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libtiff.sh hugin/trunk/mac/ExternalPrograms/scripts/static/libxmi.sh hugin/trunk/mac/ExternalPrograms/scripts/static/openexr16.sh hugin/trunk/mac/ExternalPrograms/scripts/static/pano12.sh hugin/trunk/mac/ExternalPrograms/scripts/static/pano13.sh hugin/trunk/mac/ExternalPrograms/scripts/static/wxmac28.sh hugin/trunk/mac/ExternalPrograms/scripts/wxmac28-debug.sh hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2009-12-08 02:35:20 UTC (rev 4754) @@ -7,13 +7,12 @@ # number of jobs that make can use, probably same as the number of CPUs. #PROCESSNUM=2 -PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +if [ $(uname -p) = i386 ] ; then + PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +else + PROCESSNUM="1" +fi - -export \ - CC="gcc-4.2" \ - CXX="g++-4.2"; - mkdir -p $myREPOSITORYDIR; export \ @@ -24,21 +23,29 @@ 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" \ \ ppc64TARGET="powerpc64-apple-darwin9" \ ppc64OSVERSION="10.5" \ ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ + ppc64CC="gcc-4.2" \ + ppc64CXX="g++-4.2" \ \ x64TARGET="x86_64-apple-darwin9" \ x64OSVERSION="10.5" \ x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ + x64CC="gcc-4.2" \ + x64CXX="g++-4.2" \ \ OTHERARGs="" \ OTHERMAKEARGs="--jobs=$PROCESSNUM"; @@ -52,4 +59,8 @@ x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; -# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ \ No newline at end of file +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" + +# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2009-12-08 02:35:20 UTC (rev 4754) @@ -1,5 +1,5 @@ -# Configuration for 4 part universal build, only possible from Leopard -# Copyright (c) 2008, Ippei Ukai +# Configuration for 2 part universal build +# Copyright (c) 2007-2008, Ippei Ukai # has to be the absolute path from / @@ -17,37 +17,22 @@ export \ REPOSITORYDIR="$myREPOSITORYDIR" \ - #ARCHS="ppc i386 ppc64 x86_64" \ ARCHS="ppc i386" \ \ - ppcTARGET="powerpc-apple-darwin10" \ + ppcTARGET="powerpc-apple-darwin8" \ ppcOSVERSION="10.4" \ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - ppcOPTIMIZE="-m32 -mcpu=G3 -mtune=G4 -ftree-vectorize" \ + ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ ppcCC="gcc-4.0" \ ppcCXX="g++-4.0" \ \ - i386TARGET="i686-apple-darwin10" \ + i386TARGET="i386-apple-darwin8" \ i386OSVERSION="10.4" \ - i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - i386OPTIMIZE="-m32 -march=prescott -mtune=pentium-m -ftree-vectorize" \ - i386CC="gcc-4.2" \ - i386CXX="g++-4.2" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ + i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.0" \ + i386CXX="g++-4.0" \ \ - ppc64TARGET="powerpc64-apple-darwin10" \ - ppc64OSVERSION="10.5" \ - ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - ppc64OPTIMIZE="-m64 -mcpu=G5 -mtune=G5 -ftree-vectorize" \ - ppc64CC="gcc-4.2" \ - ppc64CXX="g++-4.2" \ - \ - x64TARGET="x86_64-apple-darwin10" \ - x64OSVERSION="10.5" \ - x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - x64OPTIMIZE="-m64 -march=core2 -mtune=core2 -ftree-vectorize" \ - x64CC="gcc-4.2" \ - x64CXX="g++-4.2" \ - \ OTHERARGs="" \ OTHERMAKEARGs="--jobs=$PROCESSNUM"; @@ -55,9 +40,14 @@ # Deprecated: export \ ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ - ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ - x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION"; -# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ + +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" + + + +# $Id: SetEnv-universal.txt 1902 2007-02-04 22:27:47Z ippei $ Modified: hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -16,8 +16,10 @@ # ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and works with svn-4750 +# ------------------------------- - # init let NUMARCH="0" @@ -116,12 +118,6 @@ fi rm CMakeCache.txt; - env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ - NEXT_ROOT="$MACSDKDIR" \ - PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" ; cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL="ON" \ @@ -142,7 +138,7 @@ -DLIBXML2_LIBRARIES="/usr/lib/libxml2.dylib"; make clean; - make all -j2; + make all --jobs=$PROCESSNUM; make install; done @@ -153,22 +149,32 @@ for program in bin/autopano bin/generatekeys bin/autopano-sift-c do - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue + if [ $NUMARCH -eq 1 ] ; then + if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then + echo "Moving arch/$ARCHS/$program to $program" + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + else + echo "Program arch/$ARCHS/$program not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then + echo "Adding arch/$ARCH/$program to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + else + echo "File arch/$ARCH/$program was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; done Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -18,6 +18,9 @@ # i386OPTIMIZE ="-march=prescott -mtune=pentium-m -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- BOOST_VER="1_40" @@ -63,8 +66,8 @@ OPTIMIZE=$i386OPTIMIZE boostARCHITECTURE="x86" boostADDRESSMODEL="32" - export CC=$I386CC; - export CXX=$I386CXX; + export CC=$i386CC; + export CXX=$i386CXX; elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] then MACSDKDIR=$ppcMACSDKDIR @@ -147,17 +150,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "stage-$ARCH/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f stage-$ARCHS/$liba ] ; then + echo "Moving stage-$ARCHS/$liba to $liba" + mv "stage-$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs stage-$ARCH/$liba" + if [ -f stage-$ARCH/$liba ] ; then + echo "Adding stage-$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs stage-$ARCH/$liba" + else + echo "File stage-$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -1,26 +1,31 @@ #! /bin/sh +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- -cd /Users/sgaede/development/hugin/mac/ExternalPrograms/scripts +cd /PATHTOHUGIN/hugin/mac/ExternalPrograms/scripts cat SetEnv.txt source SetEnv.txt +pre="<<<<<<<<<<<<<<<<<<<< building" +pst=">>>>>>>>>>>>>>>>>>>>" -echo building boost && cd ../boost_1_40_0 && sh ../scripts/boost.sh -echo building expat && cd ../expat-2.0.1 && sh ../scripts/libexpat.sh; -echo building gettext && cd ../gettext-0.17 && sh ../scripts/gettext.sh -echo building libjpeg-7 && cd ../jpeg-7 && sh ../scripts/libjpeg-7.sh; -echo building libpng && cd ../libpng-1.2.38 && sh ../scripts/libpng.sh; -echo building libtiff && cd ../tiff-3.8.2 && sh ../scripts/libtiff.sh; -echo building wxmac && cd ../wxMac-2.8.10 && sh ../scripts/wxmac28.sh; -echo building ilmbase && cd ../ilmbase-1.0.1 && sh ../scripts/ilmbase.sh; -echo building openexr && cd ../openexr-1.6.1 && sh ../scripts/openexr16.sh; -echo building libpano13 && cd ../libpano13-2.9.14 && sh ../scripts/pano13.sh; -echo building libexiv2 && cd ../exiv2-0.18.2 && sh ../scripts/static/libexiv2.sh; -echo building liblcms && cd ../lcms-1.17 && sh ../scripts/lcms.sh; -echo building libxmi && cd ../libxmi-1.2 && sh ../scripts/static/libxmi.sh; -echo building libglew && cd ../glew && sh ../scripts/static/libglew.sh; -echo building gnumake-119 && cd ../gnumake-119 && sh ../scripts/gnumake.sh; -echo building enblend-enfuse && cd ../enblend-enfuse-3.2 && sh ../scripts/enblend.sh; -echo building autopano-sift-C && cd ../autopano-sift-C && sh ../scripts/autopano-sift-C.sh; -echo building panomatic && cd ../panomatic-0.9.4 && sh ../scripts/panomatic.sh; +echo "$pre boost $pst" && cd ../boost_1_40_0 && sh ../scripts/boost.sh +echo "$pre expat $pst" && cd ../expat-2.0.1 && sh ../scripts/libexpat.sh; +echo "$pre gettext $pst" && cd ../gettext-0.17 && sh ../scripts/gettext.sh +echo "$pre libjpeg-7 $pst" && cd ../jpeg-7 && sh ../scripts/libjpeg-7.sh; +echo "$pre libpng $pst" && cd ../libpng-1.2.38 && sh ../scripts/libpng.sh; +echo "$pre libtiff $pst" && cd ../tiff-3.8.2 && sh ../scripts/libtiff.sh; +echo "$pre wxmac $pst" && cd ../wxMac-2.8.10 && sh ../scripts/wxmac28.sh; +echo "$pre ilmbase $pst" && cd ../ilmbase-1.0.1 && sh ../scripts/ilmbase.sh; +echo "$pre openexr $pst" && cd ../openexr-1.6.1 && sh ../scripts/openexr16.sh; +echo "$pre libpano13 $pst" && cd ../libpano13-2.9.14 && sh ../scripts/pano13.sh; +echo "$pre libexiv2 $pst" && cd ../exiv2-0.18.2 && sh ../scripts/static/libexiv2.sh; +echo "$pre liblcms $pst" && cd ../lcms-1.17 && sh ../scripts/lcms.sh; +echo "$pre libxmi $pst" && cd ../libxmi-1.2 && sh ../scripts/static/libxmi.sh; +echo "$pre libglew $pst" && cd ../glew && sh ../scripts/static/libglew.sh; +echo "$pre gnumake-119 $pst" && cd ../gnumake-119 && sh ../scripts/gnumake.sh; +echo "$pre enblend-enfuse $pst" && cd ../enblend-enfuse-3.2 && sh ../scripts/enblend.sh; +echo "$pre autopano-sift-C $pst" && cd ../autopano-sift-C && sh ../scripts/autopano-sift-C.sh; +echo "$pre panomatic $pst" && cd ../panomatic-0.9.4 && sh ../scripts/panomatic.sh; echo "That's all, folks!!" Modified: hugin/trunk/mac/ExternalPrograms/scripts/clens.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/clens.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/clens.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -4,6 +4,11 @@ # $Id: clens.sh 1902 2007-02-04 22:27:47Z ippei $ # Copyright (c) 2007, Ippei Ukai +# ------------------------------- +# 20091206.0 sg Script NOT tested, but incorporates std boilerplate +# Check need for 2 LDFLAGS, one in Configure and one in make +# ------------------------------- + # prepare # export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ @@ -48,20 +53,30 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" CC=$i386CC CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" CC=$ppcCC CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" CC=$ppc64CC CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi env \ @@ -69,7 +84,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ @@ -95,16 +110,28 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then + echo "Moving arch/$ARCHS/$program to $program" + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + else + echo "Program arch/$ARCHS/$program not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then + echo "Adding arch/$ARCH/$program to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + else + echo "File arch/$ARCH/$program was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -17,8 +17,10 @@ # ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- - # init let NUMARCH="0" @@ -48,24 +50,28 @@ TARGET=$i386TARGET MACSDKDIR=$i386MACSDKDIR ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" CC=$i386CC CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then TARGET=$ppcTARGET MACSDKDIR=$ppcMACSDKDIR ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" CC=$ppcCC CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then TARGET=$ppc64TARGET MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" CC=$ppc64CC CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] ; then TARGET=$x64TARGET MACSDKDIR=$x64MACSDKDIR ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" CC=$x64CC CXX=$x64CXX fi @@ -75,7 +81,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ @@ -106,16 +112,28 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then + echo "Moving arch/$ARCHS/$program to $program" + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + else + echo "Program arch/$ARCHS/$program not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then + echo "Adding arch/$ARCH/$program to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + else + echo "File arch/$ARCH/$program was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -18,6 +18,9 @@ # i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- # init @@ -56,29 +59,33 @@ MACSDKDIR="" if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$i386CC - CXX=$i386CXX + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] ; then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi # first patch the make file @@ -91,14 +98,14 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include -no-cpp-precomp" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -L/usr/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --enable-shared --enable-static --disable-csharp \ --with-included-gettext --with-included-glib \ --with-included-libxml --without-examples --with-libexpat-prefix=$REPOSITORYDIR \ - --with-included-libcroco --without-emacs --with-libiconf-prefix=$MACSDKDIR/usr ; + --with-included-libcroco --without-emacs --with-libiconf-prefix=/usr ; # read input; make clean; @@ -115,17 +122,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; @@ -180,16 +199,28 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then + echo "Moving arch/$ARCHS/$program to $program" + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + else + echo "Program arch/$ARCHS/$program not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then + echo "Adding arch/$ARCH/$program to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + else + echo "File arch/$ARCH/$program was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -17,8 +17,10 @@ # ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- - # init let NUMARCH="0" @@ -60,20 +62,20 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$i386CC - CXX=$i386CXX - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX fi env \ @@ -81,7 +83,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ @@ -100,21 +102,33 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCH/$program" "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - break; - else + if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then + echo "Moving arch/$ARCHS/$program to $program" + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + else + echo "Program arch/$ARCHS/$program not found. Aborting build"; + exit 1; + fi + fi - LIPOARGs="" - for ARCH in $ARCHS - do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" - done + LIPOARGs="" + + for ARCH in $ARCHS + do + if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then + echo "Adding arch/$ARCH/$program to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + else + echo "File arch/$ARCH/$program was not found. Aborting build"; + exit 1; + fi + done - lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; - strip "$REPOSITORYDIR/$program"; - fi - + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + done cd ../ Modified: hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -17,6 +17,9 @@ # i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- # init @@ -55,34 +58,34 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$i386CC - CXX=$i386CXX - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi env \ @@ -90,7 +93,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ @@ -125,17 +128,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -19,6 +19,9 @@ # i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- # init @@ -50,29 +53,33 @@ MACSDKDIR="" if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] ; then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi @@ -84,7 +91,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ @@ -103,17 +110,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -17,6 +17,9 @@ # i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script NOT tested but uses std boilerplate +# ------------------------------- # init @@ -48,29 +51,33 @@ MACSDKDIR="" if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] ; then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi env \ @@ -78,7 +85,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ @@ -110,17 +117,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -18,11 +18,22 @@ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- + uname_release=$(uname -r) uname_arch=$(uname -p) +[ $uname_arch = powerpc ] && uname_arch="ppc" os_dotvsn=${uname_release%%.*} os_dotvsn=$(($os_dotvsn - 4)) -NATIVE_SDKDIR="/Developer/SDKs/MacOSX10.$os_dotvsn.sdk" +case $os_dotvsn in + 4 ) os_sdkvsn="10.4u" ;; + 5|6 ) os_sdkvsn=10.$os_dotvsn ;; + * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;; +esac + +NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk" NATIVE_OSVERSION="10.$os_dotvsn" NATIVE_ARCH=$uname_arch NATIVE_OPTIMIZE="" @@ -58,36 +69,52 @@ MACSDKDIR="" if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] ; then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi # Configure is looking for a specific version of crt1.o based on what the compiler was built for # This library isn't in the search path, so copy it to lib - crt1obj=lib/crt1.$NATIVE_OSVERSION.o + case $NATIVE_OSVERSION in + 10.4 ) + crt1obj="lib/crt1.o" + ;; + 10.5 | 10.6 ) + crt1obj="lib/crt1.$NATIVE_OSVERSION.o" + ;; + * ) + echo "Unsupported OS Version: $NATIVE_OSVERSION"; + exit 1; + ;; + esac + [ -f $REPOSITORYDIR/$crt1obj ] || cp $NATIVE_SDK/usr/$crt1obj $REPOSITORYDIR/$crt1obj ; - # File exists for 10.5 and 10.6. 10.4 is a problem + # File exists for 10.5 and 10.6. 10.4 is now fixed [ -f $REPOSITORYDIR/$crt1obj ] || exit 1 ; env \ @@ -95,7 +122,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip -prebind" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ @@ -115,17 +142,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/libjpeg-7.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -17,10 +17,30 @@ # i386ONLYARG="-march=prescott -mtune=pentium-m -ftree-vectorize -mmacosx-version-min=10.4" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- + JPEGLIBVER="7" # init +uname_release=$(uname -r) +uname_arch=$(uname -p) +[ $uname_arch = powerpc ] && uname_arch="ppc" +os_dotvsn=${uname_release%%.*} +os_dotvsn=$(($os_dotvsn - 4)) +case $os_dotvsn in + 4 ) os_sdkvsn="10.4u" ;; + 5|6 ) os_sdkvsn=10.$os_dotvsn ;; + * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;; +esac + +NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk" +NATIVE_OSVERSION="10.$os_dotvsn" +NATIVE_ARCH=$uname_arch +NATIVE_OPTIMIZE="" + let NUMARCH="0" for i in $ARCHS @@ -35,10 +55,21 @@ # compile -# update some of libtool stuff: config.guess and config.sub -- location has changed between 10.5 and 10.6 -path="/usr/share/libtool"; -[ -d "${path}/config" ] && path="${path}/config"; -cp -v ${path}/config.{guess,sub} ./; +# update config.guess and config.sub -- locations vary by OS version +case $NATIVE_OSVERSION in + 10.4 ) + ;; + 10.5 ) + cp /usr/share/libtool/config.{guess,sub} ./ + ;; + 10.6 ) + cp /usr/share/libtool/config/config.{guess,sub} ./ + ;; + * ) + echo "Unknown OS version; Add code to support $NATIVE_OSVERSION"; + exit 1 + ;; +esac for ARCH in $ARCHS do @@ -51,29 +82,33 @@ MACSDKDIR="" if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX elif [ $ARCH = "x86_64" ] ; then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi env \ @@ -81,7 +116,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -L$MACSDKDIR/usr/lib -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ @@ -100,17 +135,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; @@ -121,5 +168,5 @@ install_name_tool \ -id "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" \ "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib"; - ln -sfn "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" "$REPOSITORYDIR/lib/libjpeg.dylib"; + ln -sfn "libjpeg.$JPEGLIBVER.dylib" "$REPOSITORYDIR/lib/libjpeg.dylib"; fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -17,9 +17,28 @@ # i386ONLYARG="-march=prescott -mtune=pentium-m -ftree-vectorize -mmacosx-version-min=10.4" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script NOT tested but has std boilerplate +# ------------------------------- # init +uname_release=$(uname -r) +uname_arch=$(uname -p) +[ $uname_arch = powerpc ] && uname_arch="ppc" +os_dotvsn=${uname_release%%.*} +os_dotvsn=$(($os_dotvsn - 4)) +case $os_dotvsn in + 4 ) os_sdkvsn="10.4u" ;; + 5|6 ) os_sdkvsn=10.$os_dotvsn ;; + * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;; +esac + +NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk" +NATIVE_OSVERSION="10.$os_dotvsn" +NATIVE_ARCH=$uname_arch +NATIVE_OPTIMIZE="" + let NUMARCH="0" for i in $ARCHS @@ -34,10 +53,21 @@ # compile -# update some of libtool stuff: config.guess and config.sub -- location has changed between 10.5 and 10.6 -path="/usr/share/libtool"; -[ -d "${path}/config" ] && path="${path}/config"; -cp -v ${path}/config.{guess,sub} ./; +# update config.guess and config.sub -- locations vary by OS version +case $NATIVE_OSVERSION in + 10.4 ) + ;; + 10.5 ) + cp /usr/share/libtool/config.{guess,sub} ./ + ;; + 10.6 ) + cp /usr/share/libtool/config/config.{guess,sub} ./ + ;; + * ) + echo "Unknown OS version; Add code to support $NATIVE_OSVERSION"; + exit 1 + ;; +esac for ARCH in $ARCHS do @@ -49,40 +79,40 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$i386CC - CXX=$i386CXX - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi env \ CC=$CC CXX=$CXX \ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - LDFLAGS="-L$REPOSITORYDIR/lib -isysroot $MACSDKDIR -arch $ARCH -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --disable-shared --enable-static; @@ -117,17 +147,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -18,11 +18,12 @@ # ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- +PNGVER="1.2.38" -PNGVER="1.2.40" - - # init let NUMARCH="0" @@ -58,34 +59,34 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$i386CC - CXX=$i386CXX - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC - CXX=$ppcCXX - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC - CXX=$ppc64CXX - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC - CXX=$x64CXX + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi # makefile.darwin @@ -118,7 +119,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ OBJCFLAGS="-arch $ARCH" \ OBJCXXFLAGS="-arch $ARCH" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L. -isysroot $MACSDKDIR -arch $ARCH -lpng12 -lz" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng12 -lz -mmacosx-version-min=$OSVERSION" \ NEXT_ROOT="$MACSDKDIR" \ LIBPATH="$REPOSITORYDIR/arch/$ARCH/lib" \ BINPATH="$REPOSITORYDIR/arch/$ARCH/bin" \ @@ -132,17 +133,29 @@ do if [ $NUMARCH -eq 1 ] ; then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi fi LIPOARGs="" for ARCH in $ARCHS do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2009-12-08 02:25:09 UTC (rev 4753) +++ hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2009-12-08 02:35:20 UTC (rev 4754) @@ -18,11 +18,22 @@ # OTHERARGs=""; +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# ------------------------------- + uname_release=$(uname -r) uname_arch=$(uname -p) +[ $uname_arch = powerpc ] && uname_arch="ppc" os_dotvsn=${uname_release%%.*} os_dotvsn=$(($os_dotvsn - 4)) -NATIVE_SDKDIR="/Developer/SDKs/MacOSX10.$os_dotvsn.sdk" +case $os_dotvsn in + 4 ) os_sdkvsn="10.4u" ;; + 5|6 ) os_sdkvsn=10.$os_dotvsn ;; + * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;; +esac + +NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk" NATIVE_OSVERSION="10.$os_dotvsn" NATIVE_ARCH=$uname_arch NATIVE_OPTIMIZE="" @@ -52,41 +63,53 @@ ARCHARGs="" MACSDKDIR="" - if [ $ARCH = "i386" -o $ARCH = "i686" ] - then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - CC=$i386CC; - CXX=$i386CXX; - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] - then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - CC=$ppcCC; - CXX=$ppcCXX; - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] - then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - CC=$ppc64CC; - CXX=$ppc64CXX; - elif [ $ARCH = "x86_64" ] - then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - CC=$x64CC; - CXX=$x64CXX; + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX fi # Configure is looking for a specific version of crt1.o based on what the compiler was built for # This library isn't in the search path, so copy it to lib - crt1obj=lib/crt1.$NATIVE_OSVERSION.o + case $NATIVE_OSVERSION in + 10.4 ) + crt1obj="lib/crt1.o" + ;; + 10.5 | 10.6 ) + crt1obj="lib/crt1.$NATIVE_OSVERSION.o" + ;; + * ) + echo "Unsupported OS Version: $NATIVE_OSVERSION"; + exit 1; + ;; + esac + [ -f $REPOSITORYDIR/$crt1obj ] || cp $NATIVE_SDK/usr/$crt1obj $REPOSITORYDIR/$crt1obj ; - # File exists for 10.5 and 10.6. 10.4 is a problem + # File exists for 10.5 and 10.6. 10.4 is now fixed [ -f $REPOSITORYDIR/$crt1obj ] || exit 1 ; env \ @@ -94,12 +117,11 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -... [truncated message content] |
From: <ski...@us...> - 2010-01-12 07:23:06
|
Revision: 4879 http://hugin.svn.sourceforge.net/hugin/?rev=4879&view=rev Author: skipgaede Date: 2010-01-12 07:22:59 +0000 (Tue, 12 Jan 2010) Log Message: ----------- [OSX] new scripts for building dynamic versions of libexiv2 libGLEW and libxmi Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh hugin/trunk/mac/ExternalPrograms/scripts/libxmi-1.2.patch hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2010-01-12 06:24:10 UTC (rev 4878) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2010-01-12 07:22:59 UTC (rev 4879) @@ -19,6 +19,7 @@ # ------------------------------- # 20091206.0 sg Script NOT tested but uses std boilerplate +# 20100111.0 sg Script tested for building dylib # ------------------------------- # init @@ -90,9 +91,10 @@ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --enable-shared --with-libiconv-prefix=$REPOSITORYDIR --with-libintl-prefix=$REPOSITORYDIR \ - ; + --enable-static ; - [ -f "libtool-bk" ] || mv "libtool" "libtool-bk"; # just move it once, fix it many times + [ -f "libtool-bk" ] && rm libtool-bk; + mv "libtool" "libtool-bk"; sed -e "s#-dynamiclib#-shared-libgcc -dynamiclib -arch $ARCH -isysroot $MACSDKDIR#g" \ -e 's/-all_load//g' "libtool-bk" > "libtool"; chmod +x libtool Added: hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh 2010-01-12 07:22:59 UTC (rev 4879) @@ -0,0 +1,168 @@ +# ------------------ +# libpng +# ------------------ +# $Id: libglew.sh 1908 2007-02-05 14:59:45Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100110.0 sg Script enhanced to copy dynamic lib also +# ------------------------------- + +GLEW_MAJOR=1 +GLEW_MINOR=5 +GLEW_REV=1 + +# init +uname_release=$(uname -r) +uname_arch=$(uname -p) +[ $uname_arch = powerpc ] && uname_arch="ppc" +os_dotvsn=${uname_release%%.*} +os_dotvsn=$(($os_dotvsn - 4)) +case $os_dotvsn in + 4 ) os_sdkvsn="10.4u" ;; + 5|6 ) os_sdkvsn=10.$os_dotvsn ;; + * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;; +esac + +NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk" +NATIVE_OSVERSION="10.$os_dotvsn" +NATIVE_ARCH=$uname_arch +NATIVE_OPTIMIZE="" + +# update config.guess and config.sub -- locations vary by OS version +case $NATIVE_OSVERSION in + 10.4 ) + ;; + 10.5 ) + cp -f /usr/share/libtool/config.{guess,sub} ./config/ + ;; + 10.6 ) + cp -f /usr/share/libtool/config/config.{guess,sub} ./config/ + ;; + * ) + echo "Unknown OS version; Add code to support $NATIVE_OSVERSION"; + exit 1 + ;; +esac + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + CC=$x64CC + CXX=$x64CXX + fi + + make clean; + make install \ + GLEW_DEST="$REPOSITORYDIR/arch/$ARCH" \ + CC="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -dead_strip" \ + LD="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs"; + +done + + +# merge libs + +for liba in lib/libGLEW.a lib/libGLEW.$GLEW_MAJOR.$GLEW_MINOR.$GLEW_REV.dylib +do + + if [ $NUMARCH -eq 1 ] ; then + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to lib/$liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + +done + +if [ -f "$REPOSITORYDIR/lib/libGLEW.$GLEW_MAJOR.$GLEW_MINOR.$GLEW_REV.dylib" ] ; then + install_name_tool \ + -id "$REPOSITORYDIR/lib/libGLEW.$GLEW_MAJOR.$GLEW_MINOR.$GLEW_REV.dylib" \ + "$REPOSITORYDIR/lib/libGLEW.$GLEW_MAJOR.$GLEW_MINOR.$GLEW_REV.dylib"; + ln -sfn "libGLEW.$GLEW_MAJOR.$GLEW_MINOR.$GLEW_REV.dylib" "$REPOSITORYDIR/lib/libGLEW.$GLEW_MAJOR.$GLEW_MINOR.dylib"; + ln -sfn "libGLEW.$GLEW_MAJOR.$GLEW_MINOR.$GLEW_REV.dylib" "$REPOSITORYDIR/lib/libGLEW.dylib"; +fi + + +# install includes + +cp -R include/GL $REPOSITORYDIR/include/; Added: hugin/trunk/mac/ExternalPrograms/scripts/libxmi-1.2.patch =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libxmi-1.2.patch (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/libxmi-1.2.patch 2010-01-12 07:22:59 UTC (rev 4879) @@ -0,0 +1,473 @@ +diff -Naur libxmi-1.2/ltconfig libxmi-1.2-new/ltconfig +--- libxmi-1.2/ltconfig 2000-06-20 12:30:56.000000000 -0400 ++++ libxmi-1.2-new/ltconfig 2010-01-11 17:57:46.000000000 -0500 +@@ -678,6 +678,11 @@ + cygwin* | mingw* | os2*) + # We can build DLLs from non-PIC. + ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ pic_flag='-fno-common' ++ ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, +@@ -773,8 +778,8 @@ + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pic_flag -DPIC" +- echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5 +- if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then ++ echo "$progname:781: checking if $compiler PIC flag $pic_flag works" >&5 ++ if { (eval echo $progname:782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + # Append any warnings to the config.log. + cat conftest.err 1>&5 + +@@ -826,8 +831,8 @@ + chmod -w . + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -o out/conftest2.o" +-echo "$progname:829: checking if $compiler supports -c -o file.o" >&5 +-if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then ++echo "$progname:834: checking if $compiler supports -c -o file.o" >&5 ++if { (eval echo $progname:835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -859,8 +864,8 @@ + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -c -o conftest.lo" +- echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5 +-if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then ++ echo "$progname:867: checking if $compiler supports -c -o file.lo" >&5 ++if { (eval echo $progname:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -911,8 +916,8 @@ + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" +- echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +- if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then ++ echo "$progname:919: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ if { (eval echo $progname:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -955,8 +960,8 @@ + echo 'main(){return(0);}' > conftest.c + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $link_static_flag" +-echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5 +-if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++echo "$progname:963: checking if $compiler static flag $link_static_flag works" >&5 ++if { (eval echo $progname:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + echo "$ac_t$link_static_flag" 1>&6 + else + echo "$ac_t"none 1>&6 +@@ -988,7 +993,7 @@ + if test "$with_gcc" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 +- echo "$progname:991: checking for ld used by GCC" >&5 ++ echo "$progname:996: checking for ld used by GCC" >&5 + ac_prog=`($CC -print-prog-name=ld) 2>&5` + case "$ac_prog" in + # Accept absolute paths. +@@ -1012,10 +1017,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld... $ac_c" 1>&6 +- echo "$progname:1015: checking for GNU ld" >&5 ++ echo "$progname:1020: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +- echo "$progname:1018: checking for non-GNU ld" >&5 ++ echo "$progname:1023: checking for non-GNU ld" >&5 + fi + + if test -z "$LD"; then +@@ -1367,6 +1372,23 @@ + hardcode_shlibpath_var=no + ;; + ++ darwin* | rhapsody*) ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='-undefined suppress' ++ ;; ++ *) # Darwin 1.3 on ++ allow_undefined_flag='-flat_namespace -undefined suppress' ++ ;; ++ esac ++ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' ++ # We need to add '_' to the symbols in $export_symbols first ++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ whole_archive_flag_spec='-all_load $convenience' ++ ;; ++ + hpux9* | hpux10* | hpux11*) + case "$host_os" in + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; +@@ -1439,12 +1461,6 @@ + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; +- rhapsody*) +- archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' +- hardcode_libdir_flags_spec='-L$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; + + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' +@@ -1650,11 +1666,11 @@ + main(){nm_test_var='a';nm_test_func();return(0);} + EOF + +- echo "$progname:1653: checking if global_symbol_pipe works" >&5 +- if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then ++ echo "$progname:1669: checking if global_symbol_pipe works" >&5 ++ if { (eval echo $progname:1670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then ++ if { echo "$progname:1673: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then +@@ -1706,7 +1722,7 @@ + save_CFLAGS="$CFLAGS" + LIBS="conftstm.$objext" + CFLAGS="$CFLAGS$no_builtin_flag" +- if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++ if { (eval echo $progname:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + pipe_works=yes + else + echo "$progname: failed program was:" >&5 +@@ -1915,6 +1931,27 @@ + esac + ;; + ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ deplibs_check_method='file_magic Mach-O dynamically linked shared library' ++ file_magic_cmd='/usr/bin/file -L' ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ file_magic_test_file='/System/Library/Frameworks/System.framework/System' ++ ;; ++ *) # Darwin 1.3 on ++ file_magic_test_file='/usr/lib/libSystem.dylib' ++ ;; ++ esac ++ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' ++ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ ;; ++ + gnu*) + version_type=linux + need_lib_prefix=no +@@ -2053,14 +2090,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-rhapsody*) +- version_type=sunos +- library_names_spec='${libname}.so' +- soname_spec='${libname}.so' +- shlibpath_var=DYLD_LIBRARY_PATH +- deplibs_check_method=pass_all +- ;; +- + sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}.so$major' +@@ -2245,7 +2274,7 @@ + if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then + lt_cv_dlopen=no lt_cv_dlopen_libs= + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "$progname:2248: checking for dlopen in -ldl" >&5 ++echo "$progname:2277: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2253,7 +2282,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2256 "ltconfig" ++#line 2285 "ltconfig" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +@@ -2266,7 +2295,7 @@ + dlopen() + ; return 0; } + EOF +-if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2285,12 +2314,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "$progname:2288: checking for dlopen" >&5 ++echo "$progname:2317: checking for dlopen" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2293 "ltconfig" ++#line 2322 "ltconfig" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen(); below. */ + #include <assert.h> +@@ -2315,7 +2344,7 @@ + + ; return 0; } + EOF +-if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" + else +@@ -2332,7 +2361,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +-echo "$progname:2335: checking for dld_link in -ldld" >&5 ++echo "$progname:2364: checking for dld_link in -ldld" >&5 + ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2340,7 +2369,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2343 "ltconfig" ++#line 2372 "ltconfig" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +@@ -2353,7 +2382,7 @@ + dld_link() + ; return 0; } + EOF +-if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2372,12 +2401,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +-echo "$progname:2375: checking for shl_load" >&5 ++echo "$progname:2404: checking for shl_load" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2380 "ltconfig" ++#line 2409 "ltconfig" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load(); below. */ + #include <assert.h> +@@ -2402,7 +2431,7 @@ + + ; return 0; } + EOF +-if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" + else +@@ -2420,7 +2449,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +-echo "$progname:2423: checking for shl_load in -ldld" >&5 ++echo "$progname:2452: checking for shl_load in -ldld" >&5 + ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2428,7 +2457,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2431 "ltconfig" ++#line 2460 "ltconfig" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2442,7 +2471,7 @@ + shl_load() + ; return 0; } + EOF +-if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2485,17 +2514,17 @@ + for ac_hdr in dlfcn.h; do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "$progname:2488: checking for $ac_hdr" >&5 ++echo "$progname:2517: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2493 "ltconfig" ++#line 2522 "ltconfig" + #include <$ac_hdr> + int fnord = 0; + EOF + ac_try="$ac_compile >/dev/null 2>conftest.out" +-{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo $progname:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2523,7 +2552,7 @@ + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 +-echo "$progname:2526: checking whether a program can dlopen itself" >&5 ++echo "$progname:2555: checking whether a program can dlopen itself" >&5 + if test "${lt_cv_dlopen_self+set}" = set; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2531,7 +2560,7 @@ + lt_cv_dlopen_self=cross + else + cat > conftest.c <<EOF +-#line 2534 "ltconfig" ++#line 2563 "ltconfig" + + #if HAVE_DLFCN_H + #include <dlfcn.h> +@@ -2577,7 +2606,7 @@ + if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } + + EOF +-if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo $progname:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null + then + lt_cv_dlopen_self=yes + else +@@ -2596,7 +2625,7 @@ + if test "$lt_cv_dlopen_self" = yes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +-echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5 ++echo "$progname:2628: checking whether a statically linked program can dlopen itself" >&5 + if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2604,7 +2633,7 @@ + lt_cv_dlopen_self_static=cross + else + cat > conftest.c <<EOF +-#line 2607 "ltconfig" ++#line 2636 "ltconfig" + + #if HAVE_DLFCN_H + #include <dlfcn.h> +@@ -2650,7 +2679,7 @@ + if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } + + EOF +-if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo $progname:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null + then + lt_cv_dlopen_self_static=yes + else +diff -Naur libxmi-1.2/ltmain.sh libxmi-1.2-new/ltmain.sh +--- libxmi-1.2/ltmain.sh 2000-06-20 12:30:57.000000000 -0400 ++++ libxmi-1.2-new/ltmain.sh 2010-01-11 17:57:46.000000000 -0500 +@@ -1079,6 +1079,11 @@ + # These systems don't actually have c library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + elif test "$arg" = "-lm"; then + case "$host" in +@@ -1086,6 +1091,11 @@ + # These systems don't actually have math library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody math library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + fi + deplibs="$deplibs $arg" +@@ -1753,6 +1763,16 @@ + versuffix="-$major-$age-$revision" + ;; + ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ minor_current=`expr $current + 1` ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; ++ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +@@ -1763,7 +1783,16 @@ + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= +- verstring="0.0" ++ case "$version_type" in ++ darwin) ++ # we can't check for "0.0" in archive_cmds due to quoting ++ # problems, so we reset it completely ++ verstring="" ++ ;; ++ *) ++ verstring="0.0" ++ ;; ++ esac + if test "$need_version" = no; then + versuffix= + else +@@ -1795,8 +1824,8 @@ + *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; +- *-*-rhapsody*) +- # rhapsody is a little odd... ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework + deplibs="$deplibs -framework System" + ;; + *) Added: hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh 2010-01-12 07:22:59 UTC (rev 4879) @@ -0,0 +1,154 @@ +# ------------------ +# libxmi +# ------------------ +# $Id: libxmi.sh 1902 2007-02-04 22:27:47Z ippei $ +# Copyright (c) 2007, Ippei Ukai + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100111.0 sg Script enhanced to build dynamic library +# ------------------------------- + +# init +XMI_FULL_VSN=0.1.2 +XMI_VSN=0.1 + +# patch +patch -Np1 <../scripts/libxmi-1.2.patch + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX + fi + + # take the extra time and do it right (x86_64 build reuses ppc64 settings.) + [ -f config.cache ] && rm config.cache + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-static --enable-shared; + + [ -f libtool.bak ] && rm libtool.bak + mv libtool libtool.bak + sed -e "s@\(^[ ]\{4\}linkopts=\)@\1\"-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind\"@" libtool.bak >libtool + chmod +x libtool + + make clean; + make $OTHERMAKEARGs all; + make install; + +done + + +# merge libxmi + +for liba in lib/libxmi.a lib/libxmi.$XMI_FULL_VSN.dylib +do + + if [ $NUMARCH -eq 1 ] ; then + if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then + echo "Moving arch/$ARCHS/$liba to $liba" + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + #Power programming: if filename ends in "a" then ... + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + continue + else + echo "Program arch/$ARCHS/$liba not found. Aborting build"; + exit 1; + fi + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then + echo "Adding arch/$ARCH/$liba to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + else + echo "File arch/$ARCH/$liba was not found. Aborting build"; + exit 1; + fi + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; + +done + +if [ -f $REPOSITORYDIR/lib/libxmi.$XMI_FULL_VSN.dylib ] ; then + install_name_tool \ + -id "$REPOSITORYDIR/lib/libxmi.$XMI_FULL_VSN.dylib" \ + "$REPOSITORYDIR/lib/libxmi.$XMI_FULL_VSN.dylib"; + ln -sfn "libxmi.$XMI_FULL_VSN.dylib" "$REPOSITORYDIR/lib/libxmi.$XMI_VSN.dylib"; + ln -sfn "libxmi.$XMI_FULL_VSN.dylib" "$REPOSITORYDIR/lib/libxmi.dylib"; +fi + \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-01-15 10:24:46
|
Revision: 4895 http://hugin.svn.sourceforge.net/hugin/?rev=4895&view=rev Author: harryvanderwolf Date: 2010-01-15 10:24:37 +0000 (Fri, 15 Jan 2010) Log Message: ----------- [OSX] minor changes to scripts Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh 2010-01-15 10:22:53 UTC (rev 4894) +++ hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh 2010-01-15 10:24:37 UTC (rev 4895) @@ -1,5 +1,5 @@ # ------------------ -# libpng +# libglew # ------------------ # $Id: libglew.sh 1908 2007-02-05 14:59:45Z ippei $ # Copyright (c) 2007, Ippei Ukai @@ -24,7 +24,7 @@ GLEW_MAJOR=1 GLEW_MINOR=5 -GLEW_REV=1 +GLEW_REV=2 # init uname_release=$(uname -r) Modified: hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2010-01-15 10:22:53 UTC (rev 4894) +++ hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2010-01-15 10:24:37 UTC (rev 4895) @@ -29,7 +29,8 @@ #GENERATED_DYLIB_INSTALL_NAME="libpano13.1.dylib"; #libpano13-2.9.15 (needed for more recent builds -GENERATED_DYLIB_NAME="libpano13.2.0.0.dylib"; +#GENERATED_DYLIB_NAME="libpano13.2.0.0.dylib"; +GENERATED_DYLIB_NAME="libpano13.2.dylib"; GENERATED_DYLIB_INSTALL_NAME="libpano13.2.dylib"; let NUMARCH="0" @@ -151,7 +152,8 @@ done -mv $REPOSITORYDIR/lib/$GENERATED_DYLIB_NAME $REPOSITORYDIR/lib/libpano13.dylib; +#mv $REPOSITORYDIR/lib/$GENERATED_DYLIB_NAME $REPOSITORYDIR/lib/libpano13.dylib; +ln -sfn $GENERATED_DYLIB_NAME $REPOSITORYDIR/lib/libpano13.dylib; for libname in pano13 do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2010-01-17 20:08:25
|
Revision: 4904 http://hugin.svn.sourceforge.net/hugin/?rev=4904&view=rev Author: skipgaede Date: 2010-01-17 20:08:19 +0000 (Sun, 17 Jan 2010) Log Message: ----------- [OSX] edit build-all for glew-1.5.2; move vsn detection in pano13 to top for visibility Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-17 13:40:13 UTC (rev 4903) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-17 20:08:19 UTC (rev 4904) @@ -4,9 +4,10 @@ # 20100110.0 sg Make libGLEW and libexiv2 dynamic # Update to enblend-enfuse-4.0 and panotools 2.9.15 # 20100112.0 sg Made libxmi dynamic. Created lib-static directory +# 20100117.0 sg Update for glew 1.5.2 # ------------------------------- -cd /PATHTOHUGIN/mac/ExternalPrograms/scripts +cd /Users/Shared/development/hugin/ExternalPrograms/scripts cat SetEnv.txt source SetEnv.txt pre="<<<<<<<<<<<<<<<<<<<< building" @@ -25,24 +26,26 @@ echo "$pre libexiv2 $pst" && cd ../exiv2-0.18.2 && sh ../scripts/libexiv2.sh; echo "$pre liblcms $pst" && cd ../lcms-1.17 && sh ../scripts/lcms.sh; echo "$pre libxmi $pst" && cd ../libxmi-1.2 && sh ../scripts/libxmi.sh; -echo "$pre libglew $pst" && cd ../glew && sh ../scripts/libglew.sh; +echo "$pre libglew $pst" && cd ../glew-1.5.2 && sh ../scripts/libglew.sh; echo "$pre gnumake-119 $pst" && cd ../gnumake-119 && sh ../scripts/gnumake.sh; echo "$pre enblend-enfuse $pst" && cd ../enblend-enfuse-4.0 && sh ../scripts/enblend.sh; echo "$pre autopano-sift-C $pst" && cd ../autopano-sift-C && sh ../scripts/autopano-sift-C.sh; echo "$pre panomatic $pst" && cd ../panomatic-0.9.4 && sh ../scripts/panomatic.sh; # Separate static libraries into their own directory. Needed to build static tools -# Make sure you do this once, else may need to move/fixup static libs manually cd $REPOSITORYDIR if [ ! -d lib-static ] ; then mkdir -p lib-static - mv lib/*.a lib-static/ +fi +if [ -n "lib/*.a" ] ; then + cp -f lib/*.a lib-static/ + rm lib/*.a +fi +if [ ! -d lib-static/wx ] ; then mv lib/{pkgconfig,wx} lib-static/ ln -s ../lib-static/pkgconfig lib/pkgconfig - ln -s ../lib-static/wx lib/wx -else - echo lib-static already exists. Skipping move. + ln -s ../lib-static/wx lib/wx fi echo "That's all, folks!!" Modified: hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2010-01-17 13:40:13 UTC (rev 4903) +++ hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2010-01-17 20:08:19 UTC (rev 4904) @@ -20,18 +20,28 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100113.0 sg Script adjusted for libpano13-2.9.15 +# 20100117.0 sg Move code for detecting which version of pano13 to top for visibility # ------------------------------- # init -# libpano13-2.9.14 -#GENERATED_DYLIB_NAME="libpano13.1.0.0.dylib"; -#GENERATED_DYLIB_INSTALL_NAME="libpano13.1.dylib"; +# AC_INIT([pano13], [2.9.14], BUG-REPORT-ADDRESS) +libpanoVsn=$(grep "AC_INIT" configure.ac|cut -f 2 -d ,|cut -c 7-8) +case $libpanoVsn in + "14") + GENERATED_DYLIB_NAME="libpano13.1.0.0.dylib"; + GENERATED_DYLIB_INSTALL_NAME="libpano13.1.dylib"; + ;; + "15") + GENERATED_DYLIB_NAME="libpano13.2.0.0.dylib"; + GENERATED_DYLIB_INSTALL_NAME="libpano13.2.dylib"; + ;; + *) + echo "Unknown libpano version $libpanoVsn. Program aborting." + exit 1 + ;; +esac -#libpano13-2.9.15 (needed for more recent builds -#GENERATED_DYLIB_NAME="libpano13.2.0.0.dylib"; -GENERATED_DYLIB_NAME="libpano13.2.dylib"; -GENERATED_DYLIB_INSTALL_NAME="libpano13.2.dylib"; let NUMARCH="0" for i in $ARCHS @@ -114,7 +124,6 @@ done - # merge libpano13 for liba in lib/libpano13.a lib/$GENERATED_DYLIB_NAME This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-02-14 13:14:11
|
Revision: 4975 http://hugin.svn.sourceforge.net/hugin/?rev=4975&view=rev Author: harryvanderwolf Date: 2010-02-14 13:14:01 +0000 (Sun, 14 Feb 2010) Log Message: ----------- [OSX] Set all script optimalisations to -O3 instead of -O2, apart from wxmac Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh hugin/trunk/mac/ExternalPrograms/scripts/libiconv.sh hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -111,17 +111,17 @@ fi # hack that sends extra arguments to g++ - $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ - --with-thread --with-filesystem \ - variant=release link=static \ - architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ - macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ - | grep "^ " | sed 's/"//g' | sed s/$CXX/$CXX\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ - | while read COMMAND - do - echo "running command: $COMMAND" - $COMMAND - done; +# $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ +# --with-thread --with-filesystem \ +# variant=release link=static \ +# architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ +# macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ +# | grep "^ " | sed 's/"//g' | sed s/$CXX/$CXX\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ +# | while read COMMAND +# do +# echo "running command: $COMMAND" +# $COMMAND +# done; # hack that sends extra arguments to g++ $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ @@ -129,7 +129,7 @@ variant=release \ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ - | grep "^ " | sed 's/"//g' | sed s/$CXX/$CXX\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ + | grep "^ " | sed 's/"//g' | sed s/$CXX/$CXX\ "$OPTIMIZE"/ \ | while read COMMAND do echo "running command: $COMMAND" Modified: hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -96,8 +96,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include -no-cpp-precomp" \ LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -80,8 +80,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -90,8 +90,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -88,8 +88,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -83,8 +83,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -119,8 +119,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libglew.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -112,8 +112,8 @@ make clean; make install \ GLEW_DEST="$REPOSITORYDIR/arch/$ARCH" \ - CC="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -dead_strip" \ - LD="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs"; + CC="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3 -dead_strip" \ + LD="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3"; done Modified: hugin/trunk/mac/ExternalPrograms/scripts/libiconv.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libiconv.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libiconv.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -88,8 +88,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -22,7 +22,7 @@ # 20100121.0 sg Script updated for version 8 # ------------------------------- -JPEGLIBVER="8" +JPEGLIBVER="7" # init @@ -114,8 +114,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -125,7 +125,7 @@ ZLIBLIB="$MACSDKDIR/usr/lib" \ ZLIBINC="$MACSDKDIR/usr/include" \ CC="$CC" CXX="$CXX" \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ OBJCFLAGS="-arch $ARCH" \ OBJCXXFLAGS="-arch $ARCH" \ LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng$PNGVER_M -lz -mmacosx-version-min=$OSVERSION" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -115,8 +115,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -87,8 +87,8 @@ [ -f config.cache ] && rm config.cache env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -57,13 +57,13 @@ mkdir -p "$REPOSITORYDIR/include"; NATIVE_CXXFLAGS="-isysroot $NATIVE_SDK -arch $NATIVE_ARCH $NATIVE_OPTIMIZE \ - -mmacos-version-min=$NATIVE_OSVERSION -D_THREAD_SAFE -O2 -dead_strip"; + -mmacos-version-min=$NATIVE_OSVERSION -D_THREAD_SAFE -O3 -dead_strip"; g++ -DHAVE_CONFIG_H -I./IlmImf -I./config \ -I$REPOSITORYDIR/include/OpenEXR -D_THREAD_SAFE \ -I. -I./config -I$REPOSITORYDIR/include \ -I/usr/include -arch $NATIVE_ARCH $NATIVE_OPTIMIZE -ftree-vectorize \ - -mmacosx-version-min=$NATIVE_OSVERSION -O2 -dead_strip -L"$NATIVE_LIBHALF_DIR" -lHalf \ + -mmacosx-version-min=$NATIVE_OSVERSION -O3 -dead_strip -L"$NATIVE_LIBHALF_DIR" -lHalf \ -o "./IlmImf/b44ExpLogTable-native" ./IlmImf/b44ExpLogTable.cpp if [ -f "./IlmImf/b44ExpLogTable-native" ] ; then @@ -152,8 +152,8 @@ env \ CC="$CC" CXX="$CXX" \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2010-02-12 21:19:40 UTC (rev 4974) +++ hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2010-02-14 13:14:01 UTC (rev 4975) @@ -39,8 +39,13 @@ ;; "16") GENERATED_DYLIB_NAME="libpano13.2.dylib"; +<<<<<<< .mine + GENERATED_DYLIB_INSTALL_NAME="libpano13.ylib"; + ;; +======= GENERATED_DYLIB_INSTALL_NAME="libpano13.2.dylib"; ;; +>>>>>>> .r4917 *) echo "Unknown libpano version $libpanoVsn. Program aborting." exit 1 @@ -103,8 +108,8 @@ [ -d ./.libs ] && rm -R ./.libs env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-04-02 16:45:39
|
Revision: 5102 http://hugin.svn.sourceforge.net/hugin/?rev=5102&view=rev Author: harryvanderwolf Date: 2010-04-02 16:45:33 +0000 (Fri, 02 Apr 2010) Log Message: ----------- [OSX] add OpenMP enabled enblend script + Setenv file Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt hugin/trunk/mac/ExternalPrograms/scripts/enblend-openmp.sh Added: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt 2010-04-02 16:45:33 UTC (rev 5102) @@ -0,0 +1,50 @@ +# Configuration for 4 part universal build, only possible from Leopard +# Copyright (c) 2008, Ippei Ukai + + +# has to be the absolute path from / +myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; + +# number of jobs that make can use, probably same as the number of CPUs. +#PROCESSNUM=2 +PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); + + +#export \ +# CC="gcc-4.2" \ +# CXX="g++-4.2"; + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc i386" \ + \ + ppcTARGET="powerpc-apple-darwin9" \ + ppcOSVERSION="10.5" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppcOPTIMIZE="-mtune=G5 -ftree-vectorize" \ + ppcCC="gcc-4.2" \ + ppcCXX="g++-4.2" \ + \ + i386TARGET="i386-apple-darwin9" \ + i386OSVERSION="10.5" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.2" \ + i386CXX="g++-4.2" \ + \ + OTHERARGs="" \ + OTHERMAKEARGs="--jobs=$PROCESSNUM"; + + +# Deprecated: +export \ + ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" + +# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ Added: hugin/trunk/mac/ExternalPrograms/scripts/enblend-openmp.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend-openmp.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend-openmp.sh 2010-04-02 16:45:33 UTC (rev 5102) @@ -0,0 +1,189 @@ +# ------------------ +# enblend 4.0 +# ------------------ +# $Id: enblend3.sh 1908 2007-02-05 14:59:45Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20091209.0 sg Script enhanced to build Enblemd-Enfuse 4.0 +# 20091210.0 hvdw Removed code that downgraded optimization from -O3 to -O2 +# 20091223.0 sg Added argument to configure to locate missing TTF +# Building enblend documentation requires tex. Check if possible. +# 20100402.0 hvdw Adapt to build openmp enabled versions. Needs the Setenv-leopard-openmp.txt file +# ------------------------------- + +# init + +# Fancy doc builds on Enblend 3.2 are doomed to failure, so don't even try... +AC_INIT=$(grep AC_INIT Configure.in) +TEX=$(which tex) + +# If NOT 3.2 and if tex is installed, and if FreeSans.ttf is in the right place... +if [ -z "$(echo $AC_INIT|grep 3.2,)" ] && \ + [ -n "$TEX" ] && [ -f "/Users/$LOGNAME/Library/Fonts/FreeSans.ttf" ]; then + buildDOC="yes" + extraConfig="--with-ttf-path=/Users/$LOGNAME/Library/Fonts --enable-split-doc=no" + extraBuild="ps pdf xhtml" + extraInstall="install-ps install-pdf install-xhtml" +else + buildDOC="no" + extraConfig="" + extraBuild="" + extraInstall="" +fi + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + OSVERSION="$i386OSVERSION" + CC=$i386CC + CXX=$i386CXX + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + OSVERSION="$ppcOSVERSION" + CC=$ppcCC + CXX=$ppcCXX + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + OSVERSION="$ppc64OSVERSION" + CC=$ppc64CC + CXX=$ppc64CXX + elif [ $ARCH = "x86_64" ] ; then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + OSVERSION="$x64OSVERSION" + CC=$x64CC + CXX=$x64CXX + fi + +# To build documentation, you will need to install the following (port) packages: +# freefont-ttf +# gnuplot +# ghostscript +# texi2html +# transfig +# tidy +# *teTeX +# This script presumes you have installed the fonts in ~/Library/Fonts. +# See <http://trac.macports.org/ticket/16938> for how to do this. +# (Port installs the fonts here: /opt/local/share/fonts/freefont-ttf/) +# The port version of teTeX did not install cleanly for me. Instead, I downloaded a pre-built distro +# called MacTeX <http://www.tug.org/mactex/2009/>. After installing, you will need to add this +# directory to your PATH, as shown on the next line: +# export PATH=/usr/local/texlive/2009/bin/universal-darwin:$PATH +# To make the change permanent, edit ~/.profile. + + env \ + CC=$CC CXX=$CXX \ + CFLAGS="-fopenmp -isysroot $MACSDKDIR -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-fopenmp -isysroot $MACSDKDIR -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CPPFLAGS="-fopenmp -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \ + LIBS="-lGLEW -framework GLUT -lobjc -framework OpenGL -framework AGL" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ + --disable-image-cache --enable-openmp=yes \ + --with-glew $extraConfig \ + ; + + # hack; AC_FUNC_MALLOC sucks!! + +# mv ./config.h ./config.h-copy; +# sed -e 's/HAVE_MALLOC\ 0/HAVE_MALLOC\ 1/' \ +# -e 's/rpl_malloc/malloc/' \ +# "./config.h-copy" > "./config.h"; + + + # Default to standard -O3 optimization as this improves performance + # and shrinks the binary + # If you prefer -O2, change -O3 to -O2 in the 3rd line (containing the sed command). + [ -f src/Makefile.bak ] && rm src/Makefile.bak + mv src/Makefile src/Makefile.bak + sed -e "s/-O[0-9]/-O3/g" "src/Makefile.bak" > src/Makefile + + make clean; + make all $extraBuild ; + make install $extraInstall ; + +done + + +# merge execs + +for program in bin/enblend bin/enfuse +do + + if [ $NUMARCH -eq 1 ] ; then + if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then + echo "Moving arch/$ARCHS/$program to $program" + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip -x "$REPOSITORYDIR/$program"; + continue + else + echo "Program arch/$ARCHS/$program not found. Aborting build"; + exit 1; + fi + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then + echo "Adding arch/$ARCH/$program to bundle" + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + else + echo "File arch/$ARCH/$program was not found. Aborting build"; + exit 1; + fi + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + strip -x "$REPOSITORYDIR/$program"; + +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |