diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /BUILD | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'BUILD')
| -rw-r--r--[-rwxr-xr-x] | BUILD/compile-innodb | 4 | ||||
| -rwxr-xr-x | BUILD/compile-solaris-amd64 | 36 |
2 files changed, 8 insertions, 32 deletions
diff --git a/BUILD/compile-innodb b/BUILD/compile-innodb index 988c862465d..6b0b2df66da 100755..100644 --- a/BUILD/compile-innodb +++ b/BUILD/compile-innodb @@ -11,8 +11,8 @@ # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA +# this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # we assume this script is in storage/innobase/ diff --git a/BUILD/compile-solaris-amd64 b/BUILD/compile-solaris-amd64 index dbb7a5c2a7c..58e5cba7d8c 100755 --- a/BUILD/compile-solaris-amd64 +++ b/BUILD/compile-solaris-amd64 @@ -1,32 +1,8 @@ #!/bin/sh +# used for sol10-64 builder in buildbot, don't use it elsewhere +export LDFLAGS='-m64 -lmtmalloc -R/usr/sfw/lib/64' +export CFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64' +export CXXFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64' +cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON -DWITH_JEMALLOC=NO +gmake -j6 VERBOSE=1 -# Build setup for Solaris 10 - -# Make the Sun Freeware packages use the bundled Perl, instead of their own: -# ln -s `which perl` /usr/local/bin -# Your $PATH needs to include (in this order): -# /usr/local/bin:/usr/sfw/bin:/usr/ccs/bin -# (For Sun Freeware, bundled GNU utilities, Solaris ar, etc.) -# -# Required packages from http://sunfreeware.com/indexintel10.html : -# (The GNU m4 bundled with Solaris is too old.) -# automake-1.10.2-sol10-x86-local.gz -# autoconf-2.63-sol10-x86-local.gz -# m4-1.4.12-sol10-x86-local.gz -# libsigsegv-2.6-sol10-x86-local.gz -# libtool-1.5.24-sol10-x86-local.gz -# ( how to install these packages: - # wget ftp://ftp.sunfreeware.com/pub/freeware/intel/10/automake-1.10.2-sol10-x86-local.gz - # gunzip automake-1.10.2-sol10-x86-local.gz - # pkgadd -d automake-1.10.2-sol10-x86-local -# ) - -path=`dirname $0` -. "$path/SETUP.sh" -extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64" -extra_configs="$amd64_configs $max_configs --with-libevent" - -LDFLAGS="-m64 -lmtmalloc -R/usr/sfw/lib/64" -export LDFLAGS - -. "$path/FINISH.sh" |