bzr commit into mysql-falcon branch (john.embretsen:390)

[John H. Embretsen]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/ based on revid:john.embretsen@stripped

  390 John H. Embretsen	2009-05-19
      Falcon upgrade/downgrade test:  Solaris build.
       - Added configure script for Solaris SPARC 64-bit.
       - Not skipping test if revid is the same but SKIP... variable is false.

    added:
      upgrade-downgrade/include/configure_solaris_sparc_sunstudio_64bit.inc
    modified:
      upgrade-downgrade/build.bash
      upgrade-downgrade/bzr_checkout.bash
=== modified file 'upgrade-downgrade/build.bash'
--- a/upgrade-downgrade/build.bash	2009-04-29 12:07:27 +0000
+++ b/upgrade-downgrade/build.bash	2009-05-19 06:59:55 +0000
@@ -94,7 +94,8 @@ build_from_sources ()
                     J=$(( $J + 1 ))
                 elif [ x"$ARCH" =  x'sun4v' ]; then
                     # Solaris/SPARC gcc
-                    source ${AUTO_BASE}/include/configure_solaris_sparc_gcc.inc >> $BUILD_LOG 2>&1
+                     #source ${AUTO_BASE}/include/configure_solaris_sparc_gcc.inc >> $BUILD_LOG 2>&1
+                    source ${AUTO_BASE}/include/configure_solaris_sparc_sunstudio_64bit.inc >> $BUILD_LOG 2>&1
     
                     J=8
                 fi

=== modified file 'upgrade-downgrade/bzr_checkout.bash'
--- a/upgrade-downgrade/bzr_checkout.bash	2009-05-12 13:48:53 +0000
+++ b/upgrade-downgrade/bzr_checkout.bash	2009-05-19 06:59:55 +0000
@@ -280,7 +280,7 @@ else
     # check_bzr_revid returns exit code 144 if we should skip.
     bash ${AUTO_BASE}/check_bzr_revid.bash
     EXIT_CODE=$?
-    if [ ${EXIT_CODE} -ne 0 ]; then
+    if [ ${EXIT_CODE} -ne 0 ] && ${SKIP_TEST_IF_BRANCH_UNCHANGED}; then
         # either "skip" or "error"
         echo "[INFO] Non-zero exit code (${EXIT_CODE}); skipping the rest of this script after logging machine-info..." >> $LOG
         get_machine_info >> $LOG 2>&1

=== added file 'upgrade-downgrade/include/configure_solaris_sparc_sunstudio_64bit.inc'
--- a/upgrade-downgrade/include/configure_solaris_sparc_sunstudio_64bit.inc	1970-01-01 00:00:00 +0000
+++ b/upgrade-downgrade/include/configure_solaris_sparc_sunstudio_64bit.inc	2009-05-19 06:59:55 +0000
@@ -0,0 +1,59 @@
+#
+# Configuration for compiling MySQL on Solaris/SPARC 64-bit with Sun Studio.
+#
+# $Id$
+# John H. Embretsen, <john dot embretsen at sun dot com>, 2009-05-12.
+
+CCACHE_TEST=$(ccache -V 2> /dev/null)
+if [ "x$CCACHE_TEST" != "x" ]; then
+    CCACHE=$(which ccache)
+else
+    CCACHE=''
+fi
+
+# PKG_CONFIG_PATH is to ensure that 64-bit libraries are used.
+PKG_CONFIG_PATH="/usr/lib/64/pkgconfig"
+
+export CC="$CCACHE /opt/studio12/SUNWspro/bin/cc"
+export CXX="$CCACHE /opt/studio12/SUNWspro/bin/CC"
+
+# -g   : Instructs the compiler and the linker to prepare the binary for debugging.
+# -m64 : Specifies a 64-bit memory model for the compiled binaries.
+# -mt  : Indicates compilation and linking for multithreaded code.
+#
+# TODO: Add chip-specific options / optimizations?
+
+export CFLAGS="-g \
+  -xO3 \
+  -m64 \
+  -mt \
+  -DFORCE_INIT_OF_VARS"
+
+export CXXFLAGS="-g \
+  -xO3 \
+  -m64 \
+  -mt \
+  -DFORCE_INIT_OF_VARS"
+
+export LDFLAGS="-m64"   # to ensure 64-bit
+export ASFLAGS="-m64"   # to ensure 64-bit
+
+export CONFIGURATION="--disable-shared \
+  --enable-assembler \
+  --enable-dtrace \
+  --enable-local-infile \
+  --enable-thread-safe-client \
+  --with-big-tables \
+  --with-comment='MySQL-Community-Server' \
+  --with-embedded-server \
+  --with-extra-charsets=all \
+  --with-extra-charsets=complex \
+  --with-plugins=max-no-ndb \
+  --with-client-ldflags='-static' \
+  --with-mysqld-ldflags='-static' \
+  --with-readline \
+  --with-libevent \
+  --with-zlib-dir=bundled"
+  --with-ssl"
+
+


Attachment: [text/bzr-bundle] bzr/[e-mail]