mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
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)
This commit is contained in:
commit
9af177042e
3463 changed files with 1907096 additions and 85420 deletions
4
BUILD/compile-innodb
Executable file → Normal file
4
BUILD/compile-innodb
Executable file → Normal file
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue