mariadb: update to 5.5.34; cross build still broken.

This commit is contained in:
Juan RP 2013-12-02 10:00:51 +01:00
parent 5ebcea3037
commit f778ae3123
1 changed files with 4 additions and 13 deletions

View File

@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=5.5.33
revision=3
version=5.5.34
revision=1
build_style=cmake
configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@ -18,27 +18,18 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_EXTRA_CHARSETS=complex
-DSTACK_DIRECTION=1"
hostmakedepends="perl cmake bison"
hostmakedepends="perl cmake bison ncurses-devel"
makedepends="zlib-devel ncurses-devel openssl-devel readline-devel"
short_desc="Fast SQL database server, drop-in replacement for MySQL"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://mariadb.org/"
license="GPL-2"
distfiles="http://mirrors.supportex.net/$pkgname/$pkgname-$version/kvm-tarbake-jaunty-x86/$pkgname-$version.tar.gz"
checksum=233251494242e7c964523f834e513e624728f2c2602ada0eb717aaff777ac546
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" ncurses-devel"
fi
checksum=a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89
pre_configure() {
# We need some host binaries before starting cross compilation.
if [ "$CROSS_BUILD" ]; then
# Set sysroot and host.
sed -e "s,enable-static,& --sysroot=$XBPS_CROSS_BASE --host=$XBPS_CROSS_TRIPLET," \
-i storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake
sed -e "s,enable-cc-silence\",& \"--host=$XBPS_CROSS_TRIPLET\"," \
-i cmake/jemalloc.cmake
# XXX still broken: jemalloc configure execs host bins.
CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
make comp_err comp_sql gen_lex_hash