diff options
author | unknown <knielsen@knielsen-hq.org> | 2009-07-07 13:19:24 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2009-07-07 13:19:24 +0200 |
commit | 51f3e0049f3d79150e69141679fc9acabc0facfe (patch) | |
tree | 668465c9c6d6cbb245db5c9c5adda3c2e619e204 | |
parent | 9db357e2bfebf9207a507c4a2244499899a960a2 (diff) | |
download | mariadb-git-51f3e0049f3d79150e69141679fc9acabc0facfe.tar.gz |
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.
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.
-rwxr-xr-x | BUILD/compile-solaris-amd64 | 2 | ||||
-rwxr-xr-x | BUILD/compile-solaris-amd64-debug | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | BUILD/compile-solaris-amd64-debug-forte (renamed from BUILD/compile-solaris-amd64-forte-debug) | 0 | ||||
-rw-r--r-- | BUILD/compile-solaris-x86-32 | 11 | ||||
-rw-r--r-- | BUILD/compile-solaris-x86-32-debug | 11 | ||||
-rw-r--r-- | BUILD/compile-solaris-x86-32-debug-forte | 27 | ||||
-rw-r--r-- | BUILD/compile-solaris-x86-forte-32 | 19 |
7 files changed, 70 insertions, 2 deletions
diff --git a/BUILD/compile-solaris-amd64 b/BUILD/compile-solaris-amd64 index 1373fc398fe..92eff101d4c 100755 --- a/BUILD/compile-solaris-amd64 +++ b/BUILD/compile-solaris-amd64 @@ -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" diff --git a/BUILD/compile-solaris-amd64-debug b/BUILD/compile-solaris-amd64-debug index 3bc095ae385..38e910ae7c9 100755 --- a/BUILD/compile-solaris-amd64-debug +++ b/BUILD/compile-solaris-amd64-debug @@ -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" diff --git a/BUILD/compile-solaris-amd64-forte-debug b/BUILD/compile-solaris-amd64-debug-forte index 7ccf0f3a9a3..7ccf0f3a9a3 100755..100644 --- a/BUILD/compile-solaris-amd64-forte-debug +++ b/BUILD/compile-solaris-amd64-debug-forte diff --git a/BUILD/compile-solaris-x86-32 b/BUILD/compile-solaris-x86-32 new file mode 100644 index 00000000000..29965524479 --- /dev/null +++ b/BUILD/compile-solaris-x86-32 @@ -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" diff --git a/BUILD/compile-solaris-x86-32-debug b/BUILD/compile-solaris-x86-32-debug new file mode 100644 index 00000000000..9ce91495c1c --- /dev/null +++ b/BUILD/compile-solaris-x86-32-debug @@ -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" diff --git a/BUILD/compile-solaris-x86-32-debug-forte b/BUILD/compile-solaris-x86-32-debug-forte new file mode 100644 index 00000000000..777360865a2 --- /dev/null +++ b/BUILD/compile-solaris-x86-32-debug-forte @@ -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" diff --git a/BUILD/compile-solaris-x86-forte-32 b/BUILD/compile-solaris-x86-forte-32 new file mode 100644 index 00000000000..5aac376a44c --- /dev/null +++ b/BUILD/compile-solaris-x86-forte-32 @@ -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" |