[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2716)

7 Jul 2009

#At lp:maria

 2716 knielsen@knielsen-hq.org	2009-07-07
      Solaris 10 build script fixes by Toby Thain.
      
      Added build scripts for 32 bit x86 architecture on Solaris.
      Renamed some scripts for consistency.
      Changed to dynamic linking of libgcc.
      removed:
        BUILD/compile-solaris-amd64-forte-debug
      added:
        BUILD/compile-solaris-amd64-debug-forte
        BUILD/compile-solaris-x86-32
        BUILD/compile-solaris-x86-32-debug
        BUILD/compile-solaris-x86-32-debug-forte
        BUILD/compile-solaris-x86-forte-32
      modified:
        BUILD/compile-solaris-amd64
        BUILD/compile-solaris-amd64-debug

per-file messages:
  BUILD/compile-solaris-amd64
    Changed to dynamic linking of libgcc.
    
    The -static-libgcc was a legacy of the original build scripts. -R
    (analogous to -L link time search path) is a Solaris mechanism to
    ensure a needed lib directory is searched at runtime.
    
    In Solaris 10, gcc comes bundled, under /usr/sfw, allowing to use it without
    creating dependency problems. This allows eg. benefiting from ordinary system
    patch maintenance.
  BUILD/compile-solaris-amd64-debug
    Changed to dynamic linking of libgcc.
    
    The -static-libgcc was a legacy of the original build scripts. -R
    (analogous to -L link time search path) is a Solaris mechanism to
    ensure a needed lib directory is searched at runtime.
    
    In Solaris 10, gcc comes bundled, under /usr/sfw, allowing to use it without
    creating dependency problems. This allows eg. benefiting from ordinary system
    patch maintenance.
=== modified file 'BUILD/compile-solaris-amd64'

--- a/BUILD/compile-solaris-amd64	2009-05-09 04:01:53 +0000
+++ b/BUILD/compile-solaris-amd64	2009-07-07 11:19:24 +0000
@@ -26,7 +26,7 @@ path=`dirname $0`
 extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64"
 extra_configs="$amd64_configs $max_configs --with-libevent"
 
-LDFLAGS="-lmtmalloc -static-libgcc"
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
 export LDFLAGS
 
 . "$path/FINISH.sh"

=== modified file 'BUILD/compile-solaris-amd64-debug'
--- a/BUILD/compile-solaris-amd64-debug	2009-05-09 04:01:53 +0000
+++ b/BUILD/compile-solaris-amd64-debug	2009-07-07 11:19:24 +0000
@@ -5,7 +5,7 @@ path=`dirname $0`
 extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64 $debug_cflags"
 extra_configs="$amd64_configs $debug_configs $max_configs --with-libevent"
 
-LDFLAGS="-lmtmalloc -static-libgcc"
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
 export LDFLAGS
 
 . "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-amd64-debug-forte'
--- a/BUILD/compile-solaris-amd64-debug-forte	1970-01-01 00:00:00 +0000
+++ b/BUILD/compile-solaris-amd64-debug-forte	2009-07-07 11:19:24 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+# Take only #define options - the others are gcc specific.
+# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
+DEFS=""
+for F in $debug_cflags ; do
+	expr "$F" : "^-D" && DEFS="$DEFS $F"
+done
+debug_cflags="-O0 -g $DEFS"
+
+extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+warnings=""
+c_warnings=""
+cxx_warnings=""
+base_cxxflags="-noex"
+
+CC=cc
+CFLAGS="-xstrconst"
+CXX=CC
+LDFLAGS="-lmtmalloc"
+
+. "$path/FINISH.sh"

=== removed file 'BUILD/compile-solaris-amd64-forte-debug'
--- a/BUILD/compile-solaris-amd64-forte-debug	2009-05-09 04:01:53 +0000
+++ b/BUILD/compile-solaris-amd64-forte-debug	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Take only #define options - the others are gcc specific.
-# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
-DEFS=""
-for F in $debug_cflags ; do
-	expr "$F" : "^-D" && DEFS="$DEFS $F"
-done
-debug_cflags="-O0 -g $DEFS"
-
-extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags"
-extra_configs="$max_configs --with-libevent $debug_configs"
-
-warnings=""
-c_warnings=""
-cxx_warnings=""
-base_cxxflags="-noex"
-
-CC=cc
-CFLAGS="-xstrconst"
-CXX=CC
-LDFLAGS="-lmtmalloc"
-
-. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32'
--- a/BUILD/compile-solaris-x86-32	1970-01-01 00:00:00 +0000
+++ b/BUILD/compile-solaris-x86-32	2009-07-07 11:19:24 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="-D__sun -m32"
+extra_configs="$max_configs --with-libevent"
+
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
+export LDFLAGS
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32-debug'
--- a/BUILD/compile-solaris-x86-32-debug	1970-01-01 00:00:00 +0000
+++ b/BUILD/compile-solaris-x86-32-debug	2009-07-07 11:19:24 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="-D__sun -m32 $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
+export LDFLAGS
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32-debug-forte'
--- a/BUILD/compile-solaris-x86-32-debug-forte	1970-01-01 00:00:00 +0000
+++ b/BUILD/compile-solaris-x86-32-debug-forte	2009-07-07 11:19:24 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+# Take only #define options - the others are gcc specific.
+# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
+DEFS=""
+for F in $debug_cflags ; do
+        expr "$F" : "^-D" && DEFS="$DEFS $F"
+done
+debug_cflags="-O0 -g $DEFS"
+
+extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3 $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+warnings=""
+c_warnings=""
+cxx_warnings=""
+base_cxxflags="-noex"
+
+CC=cc
+CFLAGS="-xstrconst"
+CXX=CC
+LDFLAGS="-lmtmalloc"
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-forte-32'
--- a/BUILD/compile-solaris-x86-forte-32	1970-01-01 00:00:00 +0000
+++ b/BUILD/compile-solaris-x86-forte-32	2009-07-07 11:19:24 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3"
+extra_configs="$max_configs --with-libevent"
+
+warnings=""
+c_warnings=""
+cxx_warnings=""
+base_cxxflags="-noex"
+
+CC=cc
+CFLAGS="-xstrconst"
+CXX=CC
+LDFLAGS="-lmtmalloc"
+
+. "$path/FINISH.sh"

    

knielsen＠knielsen-hq.org

tags

participants (1)