diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-12 10:10:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-12 10:10:09 +0200 |
| commit | adf637dff6484e602567a5294a43cb4b3aea606f (patch) | |
| tree | 154d81303237c10d1d818c1771a12c08f6f4baa5 | |
| parent | 6ee207a515de8dd74cf071cac20abe13d7d83d88 (diff) | |
| download | mariadb-git-adf637dff6484e602567a5294a43cb4b3aea606f.tar.gz | |
tokudb buildbot fixes
BUILD/compile-solaris-amd64:
* call cmake directly, don't go through three layers of wrappers
(but preserve the compile-solaris-amd64 file - buildbot uses it for 5.1 and 5.5)
* disable jemalloc, it doesn't compile on our sol10-64 box
storage/federated/ha_federated.cc:
clang warning
storage/tokudb/CMakeLists.txt:
* require cmake-2.8.9, because 2.8.8 doesn't add -fPIC for POSITION_INDEPENDENT_CODE
property that ft-index CMakeLists.txt files are using
| -rwxr-xr-x | BUILD/compile-solaris-amd64 | 36 | ||||
| -rw-r--r-- | storage/federated/ha_federated.cc | 2 | ||||
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 4 |
3 files changed, 9 insertions, 33 deletions
diff --git a/BUILD/compile-solaris-amd64 b/BUILD/compile-solaris-amd64 index dbb7a5c2a7c..6aaafda073a 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' +export CFLAGS='-D__sun -m64 -mtune=athlon64' +export CXXFLAGS='-D__sun -m64 -mtune=athlon64' +cmake -DBUILD_CONFIG=mysql_release -DWITH_JEMALLOC=NO . +gmake -j6 -# 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" diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 40b8d3d24d9..059df54bd51 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -828,7 +828,7 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table, user:@hostname:port/db/table Then password is a null string, so set to NULL */ - if ((share->password[0] == '\0')) + if (share->password[0] == '\0') share->password= NULL; } else diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 28c714fb7d9..fb6cfeb2aec 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -1,6 +1,6 @@ -# ft-index only supports x86-64 and cmake-2.8.8+ +# ft-index only supports x86-64 and cmake-2.8.9+ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND - NOT CMAKE_VERSION VERSION_LESS "2.8.8") + NOT CMAKE_VERSION VERSION_LESS "2.8.9") CHECK_CXX_SOURCE_COMPILES( " struct a {int b; int c; }; |