- Make script x86_64 aware

- increase initial disk image size to deal with the extra file metadata
  due to now having 4 builds

This commit was SVN r11146.

contrib/dist/macosx-pkg/buildpackage.sh

@@ -32,14 +32,14 @@
 # User-configurable stuff
 #
 OMPI_PREFIX="/usr/local/"
-OMPI_OPTIONS="--disable-mpi-f77 --without-cs-fs -enable-mca-no-build=ras-slurm,pls-slurm,gpr-null,pml-teg,pml-uniq,ptl-self,ptl-sm,ptl-tcp,sds-pipe,sds-slurm"
+OMPI_OPTIONS="--disable-mpi-f77 --without-cs-fs -enable-mca-no-build=ras-slurm,pls-slurm,gpr-null,sds-pipe,sds-slurm"
 OMPI_PACKAGE="openmpi"
 OMPI_VER_PACKAGE="openmpi"
 OMPI_OSX_README="ReadMe.rtf"
 # note - if want XGrid support, make sure that a cocoa-supported 
 # architecture appears first on the list.  Otherwise, we won't
 # lipo that component and it will be dropped
-OMPI_ARCH_LIST="ppc i386"
+OMPI_ARCH_LIST="ppc ppc64 i386"
 OMPI_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
 
 #
@@ -176,6 +176,13 @@ for arch in $OMPI_ARCH_LIST ; do
         i386)
             host_arch="i386-apple-darwin"`uname -r`
             ;;
+        x86_64)
+            host_arch="x86_64-apple-darwin"`uname -r`
+            ;;
+        *)
+            echo "**** Could not find arch string for $arch ****"
+            exit 1
+            ;;
     esac
 
     #
@@ -260,6 +267,13 @@ print_arch_if() {
         i386)
             echo "#ifdef __i386__" >> mpi.h
             ;;
+        x86_64)
+            echo "#ifdef __x86_64__" >> mpi.h
+            ;;
+        *)
+            echo "*** Could not find arch #ifdef for $1"
+            exit 1
+            ;;
     esac
 } 
 
@@ -433,7 +447,7 @@ echo "--> Creating Disc Image"
 # Allocated about 2.5MB more than we need, just to be safe.  If that
 # number is less than about 5MB, make 5MB to keep disk utilities
 # happy.
-sectorsAlloced=`echo 2*${compressedSize}+20|bc`
+sectorsAlloced=`echo 2*${compressedSize}+50|bc`
 if [ $sectorsAlloced -lt 10000 ]; then
     sectorsAlloced=10000
 fi